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

Comparing libev/ev.c (file contents):
Revision 1.196 by root, Sat Dec 22 12:43:28 2007 UTC vs.
Revision 1.229 by root, Fri May 2 08:08:45 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_active(w) ((W)(w))->active
331#define ev_at(w) ((WT)(w))->at
332
333#if EV_USE_MONOTONIC
285/* 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 */
286/* giving it a reasonably high chance of working on typical architetcures */ 335/* giving it a reasonably high chance of working on typical architetcures */
287static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 336static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
337#endif
288 338
289#ifdef _WIN32 339#ifdef _WIN32
290# include "ev_win32.c" 340# include "ev_win32.c"
291#endif 341#endif
292 342
… …
313 perror (msg); 363 perror (msg);
314 abort (); 364 abort ();
315 } 365 }
316} 366}
317 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
318static void *(*alloc)(void *ptr, long size); 383static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
319 384
320void 385void
321ev_set_allocator (void *(*cb)(void *ptr, long size)) 386ev_set_allocator (void *(*cb)(void *ptr, long size))
322{ 387{
323 alloc = cb; 388 alloc = cb;
324} 389}
325 390
326inline_speed void * 391inline_speed void *
327ev_realloc (void *ptr, long size) 392ev_realloc (void *ptr, long size)
328{ 393{
329 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 394 ptr = alloc (ptr, size);
330 395
331 if (!ptr && size) 396 if (!ptr && size)
332 { 397 {
333 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 398 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
334 abort (); 399 abort ();
… …
441 ts.tv_sec = (time_t)delay; 506 ts.tv_sec = (time_t)delay;
442 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 507 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
443 508
444 nanosleep (&ts, 0); 509 nanosleep (&ts, 0);
445#elif defined(_WIN32) 510#elif defined(_WIN32)
446 Sleep (delay * 1e3); 511 Sleep ((unsigned long)(delay * 1e3));
447#else 512#else
448 struct timeval tv; 513 struct timeval tv;
449 514
450 tv.tv_sec = (time_t)delay; 515 tv.tv_sec = (time_t)delay;
451 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 516 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
590 655
591#if EV_SELECT_IS_WINSOCKET 656#if EV_SELECT_IS_WINSOCKET
592 if (events) 657 if (events)
593 { 658 {
594 unsigned long argp; 659 unsigned long argp;
660 #ifdef EV_FD_TO_WIN32_HANDLE
661 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
662 #else
595 anfd->handle = _get_osfhandle (fd); 663 anfd->handle = _get_osfhandle (fd);
664 #endif
596 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 665 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
597 } 666 }
598#endif 667#endif
599 668
600 { 669 {
… …
688 } 757 }
689} 758}
690 759
691/*****************************************************************************/ 760/*****************************************************************************/
692 761
762/* towards the root */
693void inline_speed 763void inline_speed
694upheap (WT *heap, int k) 764upheap (WT *heap, int k)
695{ 765{
696 WT w = heap [k]; 766 WT w = heap [k];
697 767
698 while (k) 768 for (;;)
699 { 769 {
700 int p = (k - 1) >> 1; 770 int p = k >> 1;
701 771
772 /* maybe we could use a dummy element at heap [0]? */
702 if (heap [p]->at <= w->at) 773 if (!p || heap [p]->at <= w->at)
703 break; 774 break;
704 775
705 heap [k] = heap [p]; 776 heap [k] = heap [p];
706 ((W)heap [k])->active = k + 1; 777 ((W)heap [k])->active = k;
707 k = p; 778 k = p;
708 } 779 }
709 780
710 heap [k] = w; 781 heap [k] = w;
711 ((W)heap [k])->active = k + 1; 782 ((W)heap [k])->active = k;
712} 783}
713 784
785/* away from the root */
714void inline_speed 786void inline_speed
715downheap (WT *heap, int N, int k) 787downheap (WT *heap, int N, int k)
716{ 788{
717 WT w = heap [k]; 789 WT w = heap [k];
718 790
719 for (;;) 791 for (;;)
720 { 792 {
721 int c = (k << 1) + 1; 793 int c = k << 1;
722 794
723 if (c >= N) 795 if (c > N)
724 break; 796 break;
725 797
726 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 798 c += c < N && heap [c]->at > heap [c + 1]->at
727 ? 1 : 0; 799 ? 1 : 0;
728 800
729 if (w->at <= heap [c]->at) 801 if (w->at <= heap [c]->at)
730 break; 802 break;
731 803
732 heap [k] = heap [c]; 804 heap [k] = heap [c];
733 ((W)heap [k])->active = k + 1; 805 ((W)heap [k])->active = k;
734 806
735 k = c; 807 k = c;
736 } 808 }
737 809
738 heap [k] = w; 810 heap [k] = w;
739 ((W)heap [k])->active = k + 1; 811 ((W)heap [k])->active = k;
740} 812}
741 813
742void inline_size 814void inline_size
743adjustheap (WT *heap, int N, int k) 815adjustheap (WT *heap, int N, int k)
744{ 816{
… …
749/*****************************************************************************/ 821/*****************************************************************************/
750 822
751typedef struct 823typedef struct
752{ 824{
753 WL head; 825 WL head;
754 sig_atomic_t volatile gotsig; 826 EV_ATOMIC_T gotsig;
755} ANSIG; 827} ANSIG;
756 828
757static ANSIG *signals; 829static ANSIG *signals;
758static int signalmax; 830static int signalmax;
759 831
760static int sigpipe [2]; 832static EV_ATOMIC_T gotsig;
761static sig_atomic_t volatile gotsig;
762static ev_io sigev;
763 833
764void inline_size 834void inline_size
765signals_init (ANSIG *base, int count) 835signals_init (ANSIG *base, int count)
766{ 836{
767 while (count--) 837 while (count--)
… …
771 841
772 ++base; 842 ++base;
773 } 843 }
774} 844}
775 845
776static void 846/*****************************************************************************/
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 847
827void inline_speed 848void inline_speed
828fd_intern (int fd) 849fd_intern (int fd)
829{ 850{
830#ifdef _WIN32 851#ifdef _WIN32
… …
835 fcntl (fd, F_SETFL, O_NONBLOCK); 856 fcntl (fd, F_SETFL, O_NONBLOCK);
836#endif 857#endif
837} 858}
838 859
839static void noinline 860static void noinline
840siginit (EV_P) 861evpipe_init (EV_P)
841{ 862{
863 if (!ev_is_active (&pipeev))
864 {
865#if EV_USE_EVENTFD
866 if ((evfd = eventfd (0, 0)) >= 0)
867 {
868 evpipe [0] = -1;
869 fd_intern (evfd);
870 ev_io_set (&pipeev, evfd, EV_READ);
871 }
872 else
873#endif
874 {
875 while (pipe (evpipe))
876 syserr ("(libev) error creating signal/async pipe");
877
842 fd_intern (sigpipe [0]); 878 fd_intern (evpipe [0]);
843 fd_intern (sigpipe [1]); 879 fd_intern (evpipe [1]);
880 ev_io_set (&pipeev, evpipe [0], EV_READ);
881 }
844 882
845 ev_io_set (&sigev, sigpipe [0], EV_READ);
846 ev_io_start (EV_A_ &sigev); 883 ev_io_start (EV_A_ &pipeev);
847 ev_unref (EV_A); /* child watcher should not keep loop alive */ 884 ev_unref (EV_A); /* watcher should not keep loop alive */
885 }
886}
887
888void inline_size
889evpipe_write (EV_P_ EV_ATOMIC_T *flag)
890{
891 if (!*flag)
892 {
893 int old_errno = errno; /* save errno because write might clobber it */
894
895 *flag = 1;
896
897#if EV_USE_EVENTFD
898 if (evfd >= 0)
899 {
900 uint64_t counter = 1;
901 write (evfd, &counter, sizeof (uint64_t));
902 }
903 else
904#endif
905 write (evpipe [1], &old_errno, 1);
906
907 errno = old_errno;
908 }
909}
910
911static void
912pipecb (EV_P_ ev_io *iow, int revents)
913{
914#if EV_USE_EVENTFD
915 if (evfd >= 0)
916 {
917 uint64_t counter = 1;
918 read (evfd, &counter, sizeof (uint64_t));
919 }
920 else
921#endif
922 {
923 char dummy;
924 read (evpipe [0], &dummy, 1);
925 }
926
927 if (gotsig && ev_is_default_loop (EV_A))
928 {
929 int signum;
930 gotsig = 0;
931
932 for (signum = signalmax; signum--; )
933 if (signals [signum].gotsig)
934 ev_feed_signal_event (EV_A_ signum + 1);
935 }
936
937#if EV_ASYNC_ENABLE
938 if (gotasync)
939 {
940 int i;
941 gotasync = 0;
942
943 for (i = asynccnt; i--; )
944 if (asyncs [i]->sent)
945 {
946 asyncs [i]->sent = 0;
947 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
948 }
949 }
950#endif
848} 951}
849 952
850/*****************************************************************************/ 953/*****************************************************************************/
851 954
955static void
956ev_sighandler (int signum)
957{
958#if EV_MULTIPLICITY
959 struct ev_loop *loop = &default_loop_struct;
960#endif
961
962#if _WIN32
963 signal (signum, ev_sighandler);
964#endif
965
966 signals [signum - 1].gotsig = 1;
967 evpipe_write (EV_A_ &gotsig);
968}
969
970void noinline
971ev_feed_signal_event (EV_P_ int signum)
972{
973 WL w;
974
975#if EV_MULTIPLICITY
976 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
977#endif
978
979 --signum;
980
981 if (signum < 0 || signum >= signalmax)
982 return;
983
984 signals [signum].gotsig = 0;
985
986 for (w = signals [signum].head; w; w = w->next)
987 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
988}
989
990/*****************************************************************************/
991
852static WL childs [EV_PID_HASHSIZE]; 992static WL childs [EV_PID_HASHSIZE];
853 993
854#ifndef _WIN32 994#ifndef _WIN32
855 995
856static ev_signal childev; 996static ev_signal childev;
857 997
998#ifndef WIFCONTINUED
999# define WIFCONTINUED(status) 0
1000#endif
1001
858void inline_speed 1002void inline_speed
859child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1003child_reap (EV_P_ int chain, int pid, int status)
860{ 1004{
861 ev_child *w; 1005 ev_child *w;
1006 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
862 1007
863 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1008 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1009 {
864 if (w->pid == pid || !w->pid) 1010 if ((w->pid == pid || !w->pid)
1011 && (!traced || (w->flags & 1)))
865 { 1012 {
866 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1013 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; 1014 w->rpid = pid;
868 w->rstatus = status; 1015 w->rstatus = status;
869 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1016 ev_feed_event (EV_A_ (W)w, EV_CHILD);
870 } 1017 }
1018 }
871} 1019}
872 1020
873#ifndef WCONTINUED 1021#ifndef WCONTINUED
874# define WCONTINUED 0 1022# define WCONTINUED 0
875#endif 1023#endif
… …
884 if (!WCONTINUED 1032 if (!WCONTINUED
885 || errno != EINVAL 1033 || errno != EINVAL
886 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1034 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
887 return; 1035 return;
888 1036
889 /* make sure we are called again until all childs have been reaped */ 1037 /* 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 */ 1038 /* 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); 1039 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
892 1040
893 child_reap (EV_A_ sw, pid, pid, status); 1041 child_reap (EV_A_ pid, pid, status);
894 if (EV_PID_HASHSIZE > 1) 1042 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 */ 1043 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
896} 1044}
897 1045
898#endif 1046#endif
899 1047
900/*****************************************************************************/ 1048/*****************************************************************************/
… …
978 1126
979 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1127 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
980 /* please fix it and tell me how to detect the fix */ 1128 /* please fix it and tell me how to detect the fix */
981 flags &= ~EVBACKEND_EPOLL; 1129 flags &= ~EVBACKEND_EPOLL;
982 1130
983#ifdef __APPLE__
984 /* is there anything thats not broken on darwin? */
985 flags &= ~EVBACKEND_KQUEUE;
986#endif
987
988 return flags; 1131 return flags;
989} 1132}
990 1133
991unsigned int 1134unsigned int
992ev_backend (EV_P) 1135ev_backend (EV_P)
… …
1023 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1166 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1024 have_monotonic = 1; 1167 have_monotonic = 1;
1025 } 1168 }
1026#endif 1169#endif
1027 1170
1028 ev_rt_now = ev_time (); 1171 ev_rt_now = ev_time ();
1029 mn_now = get_clock (); 1172 mn_now = get_clock ();
1030 now_floor = mn_now; 1173 now_floor = mn_now;
1031 rtmn_diff = ev_rt_now - mn_now; 1174 rtmn_diff = ev_rt_now - mn_now;
1032 1175
1033 io_blocktime = 0.; 1176 io_blocktime = 0.;
1034 timeout_blocktime = 0.; 1177 timeout_blocktime = 0.;
1178 backend = 0;
1179 backend_fd = -1;
1180 gotasync = 0;
1181#if EV_USE_INOTIFY
1182 fs_fd = -2;
1183#endif
1035 1184
1036 /* pid check not overridable via env */ 1185 /* pid check not overridable via env */
1037#ifndef _WIN32 1186#ifndef _WIN32
1038 if (flags & EVFLAG_FORKCHECK) 1187 if (flags & EVFLAG_FORKCHECK)
1039 curpid = getpid (); 1188 curpid = getpid ();
… …
1042 if (!(flags & EVFLAG_NOENV) 1191 if (!(flags & EVFLAG_NOENV)
1043 && !enable_secure () 1192 && !enable_secure ()
1044 && getenv ("LIBEV_FLAGS")) 1193 && getenv ("LIBEV_FLAGS"))
1045 flags = atoi (getenv ("LIBEV_FLAGS")); 1194 flags = atoi (getenv ("LIBEV_FLAGS"));
1046 1195
1047 if (!(flags & 0x0000ffffUL)) 1196 if (!(flags & 0x0000ffffU))
1048 flags |= ev_recommended_backends (); 1197 flags |= ev_recommended_backends ();
1049
1050 backend = 0;
1051 backend_fd = -1;
1052#if EV_USE_INOTIFY
1053 fs_fd = -2;
1054#endif
1055 1198
1056#if EV_USE_PORT 1199#if EV_USE_PORT
1057 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1200 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1058#endif 1201#endif
1059#if EV_USE_KQUEUE 1202#if EV_USE_KQUEUE
… …
1067#endif 1210#endif
1068#if EV_USE_SELECT 1211#if EV_USE_SELECT
1069 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1212 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1070#endif 1213#endif
1071 1214
1072 ev_init (&sigev, sigcb); 1215 ev_init (&pipeev, pipecb);
1073 ev_set_priority (&sigev, EV_MAXPRI); 1216 ev_set_priority (&pipeev, EV_MAXPRI);
1074 } 1217 }
1075} 1218}
1076 1219
1077static void noinline 1220static void noinline
1078loop_destroy (EV_P) 1221loop_destroy (EV_P)
1079{ 1222{
1080 int i; 1223 int i;
1224
1225 if (ev_is_active (&pipeev))
1226 {
1227 ev_ref (EV_A); /* signal watcher */
1228 ev_io_stop (EV_A_ &pipeev);
1229
1230#if EV_USE_EVENTFD
1231 if (evfd >= 0)
1232 close (evfd);
1233#endif
1234
1235 if (evpipe [0] >= 0)
1236 {
1237 close (evpipe [0]);
1238 close (evpipe [1]);
1239 }
1240 }
1081 1241
1082#if EV_USE_INOTIFY 1242#if EV_USE_INOTIFY
1083 if (fs_fd >= 0) 1243 if (fs_fd >= 0)
1084 close (fs_fd); 1244 close (fs_fd);
1085#endif 1245#endif
… …
1122#if EV_FORK_ENABLE 1282#if EV_FORK_ENABLE
1123 array_free (fork, EMPTY); 1283 array_free (fork, EMPTY);
1124#endif 1284#endif
1125 array_free (prepare, EMPTY); 1285 array_free (prepare, EMPTY);
1126 array_free (check, EMPTY); 1286 array_free (check, EMPTY);
1287#if EV_ASYNC_ENABLE
1288 array_free (async, EMPTY);
1289#endif
1127 1290
1128 backend = 0; 1291 backend = 0;
1129} 1292}
1130 1293
1294#if EV_USE_INOTIFY
1131void inline_size infy_fork (EV_P); 1295void inline_size infy_fork (EV_P);
1296#endif
1132 1297
1133void inline_size 1298void inline_size
1134loop_fork (EV_P) 1299loop_fork (EV_P)
1135{ 1300{
1136#if EV_USE_PORT 1301#if EV_USE_PORT
… …
1144#endif 1309#endif
1145#if EV_USE_INOTIFY 1310#if EV_USE_INOTIFY
1146 infy_fork (EV_A); 1311 infy_fork (EV_A);
1147#endif 1312#endif
1148 1313
1149 if (ev_is_active (&sigev)) 1314 if (ev_is_active (&pipeev))
1150 { 1315 {
1151 /* default loop */ 1316 /* this "locks" the handlers against writing to the pipe */
1317 /* while we modify the fd vars */
1318 gotsig = 1;
1319#if EV_ASYNC_ENABLE
1320 gotasync = 1;
1321#endif
1152 1322
1153 ev_ref (EV_A); 1323 ev_ref (EV_A);
1154 ev_io_stop (EV_A_ &sigev); 1324 ev_io_stop (EV_A_ &pipeev);
1325
1326#if EV_USE_EVENTFD
1327 if (evfd >= 0)
1328 close (evfd);
1329#endif
1330
1331 if (evpipe [0] >= 0)
1332 {
1155 close (sigpipe [0]); 1333 close (evpipe [0]);
1156 close (sigpipe [1]); 1334 close (evpipe [1]);
1335 }
1157 1336
1158 while (pipe (sigpipe))
1159 syserr ("(libev) error creating pipe");
1160
1161 siginit (EV_A); 1337 evpipe_init (EV_A);
1338 /* now iterate over everything, in case we missed something */
1339 pipecb (EV_A_ &pipeev, EV_READ);
1162 } 1340 }
1163 1341
1164 postfork = 0; 1342 postfork = 0;
1165} 1343}
1166 1344
… …
1188} 1366}
1189 1367
1190void 1368void
1191ev_loop_fork (EV_P) 1369ev_loop_fork (EV_P)
1192{ 1370{
1193 postfork = 1; 1371 postfork = 1; /* must be in line with ev_default_fork */
1194} 1372}
1195 1373
1196#endif 1374#endif
1197 1375
1198#if EV_MULTIPLICITY 1376#if EV_MULTIPLICITY
… …
1201#else 1379#else
1202int 1380int
1203ev_default_loop (unsigned int flags) 1381ev_default_loop (unsigned int flags)
1204#endif 1382#endif
1205{ 1383{
1206 if (sigpipe [0] == sigpipe [1])
1207 if (pipe (sigpipe))
1208 return 0;
1209
1210 if (!ev_default_loop_ptr) 1384 if (!ev_default_loop_ptr)
1211 { 1385 {
1212#if EV_MULTIPLICITY 1386#if EV_MULTIPLICITY
1213 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1387 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1214#else 1388#else
… …
1217 1391
1218 loop_init (EV_A_ flags); 1392 loop_init (EV_A_ flags);
1219 1393
1220 if (ev_backend (EV_A)) 1394 if (ev_backend (EV_A))
1221 { 1395 {
1222 siginit (EV_A);
1223
1224#ifndef _WIN32 1396#ifndef _WIN32
1225 ev_signal_init (&childev, childcb, SIGCHLD); 1397 ev_signal_init (&childev, childcb, SIGCHLD);
1226 ev_set_priority (&childev, EV_MAXPRI); 1398 ev_set_priority (&childev, EV_MAXPRI);
1227 ev_signal_start (EV_A_ &childev); 1399 ev_signal_start (EV_A_ &childev);
1228 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1400 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1245#ifndef _WIN32 1417#ifndef _WIN32
1246 ev_ref (EV_A); /* child watcher */ 1418 ev_ref (EV_A); /* child watcher */
1247 ev_signal_stop (EV_A_ &childev); 1419 ev_signal_stop (EV_A_ &childev);
1248#endif 1420#endif
1249 1421
1250 ev_ref (EV_A); /* signal watcher */
1251 ev_io_stop (EV_A_ &sigev);
1252
1253 close (sigpipe [0]); sigpipe [0] = 0;
1254 close (sigpipe [1]); sigpipe [1] = 0;
1255
1256 loop_destroy (EV_A); 1422 loop_destroy (EV_A);
1257} 1423}
1258 1424
1259void 1425void
1260ev_default_fork (void) 1426ev_default_fork (void)
… …
1262#if EV_MULTIPLICITY 1428#if EV_MULTIPLICITY
1263 struct ev_loop *loop = ev_default_loop_ptr; 1429 struct ev_loop *loop = ev_default_loop_ptr;
1264#endif 1430#endif
1265 1431
1266 if (backend) 1432 if (backend)
1267 postfork = 1; 1433 postfork = 1; /* must be in line with ev_loop_fork */
1268} 1434}
1269 1435
1270/*****************************************************************************/ 1436/*****************************************************************************/
1271 1437
1272void 1438void
… …
1296} 1462}
1297 1463
1298void inline_size 1464void inline_size
1299timers_reify (EV_P) 1465timers_reify (EV_P)
1300{ 1466{
1301 while (timercnt && ((WT)timers [0])->at <= mn_now) 1467 while (timercnt && ev_at (timers [1]) <= mn_now)
1302 { 1468 {
1303 ev_timer *w = (ev_timer *)timers [0]; 1469 ev_timer *w = (ev_timer *)timers [1];
1304 1470
1305 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1471 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1306 1472
1307 /* first reschedule or stop timer */ 1473 /* first reschedule or stop timer */
1308 if (w->repeat) 1474 if (w->repeat)
1309 { 1475 {
1310 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1476 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1311 1477
1312 ((WT)w)->at += w->repeat; 1478 ev_at (w) += w->repeat;
1313 if (((WT)w)->at < mn_now) 1479 if (ev_at (w) < mn_now)
1314 ((WT)w)->at = mn_now; 1480 ev_at (w) = mn_now;
1315 1481
1316 downheap (timers, timercnt, 0); 1482 downheap (timers, timercnt, 1);
1317 } 1483 }
1318 else 1484 else
1319 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1485 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1320 1486
1321 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1487 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1324 1490
1325#if EV_PERIODIC_ENABLE 1491#if EV_PERIODIC_ENABLE
1326void inline_size 1492void inline_size
1327periodics_reify (EV_P) 1493periodics_reify (EV_P)
1328{ 1494{
1329 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1495 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1330 { 1496 {
1331 ev_periodic *w = (ev_periodic *)periodics [0]; 1497 ev_periodic *w = (ev_periodic *)periodics [1];
1332 1498
1333 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1499 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1334 1500
1335 /* first reschedule or stop timer */ 1501 /* first reschedule or stop timer */
1336 if (w->reschedule_cb) 1502 if (w->reschedule_cb)
1337 { 1503 {
1338 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1504 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1339 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1505 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1340 downheap (periodics, periodiccnt, 0); 1506 downheap (periodics, periodiccnt, 1);
1341 } 1507 }
1342 else if (w->interval) 1508 else if (w->interval)
1343 { 1509 {
1344 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1510 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1345 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval; 1511 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1346 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1512 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1347 downheap (periodics, periodiccnt, 0); 1513 downheap (periodics, periodiccnt, 1);
1348 } 1514 }
1349 else 1515 else
1350 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1516 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1351 1517
1352 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1518 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1362 for (i = 0; i < periodiccnt; ++i) 1528 for (i = 0; i < periodiccnt; ++i)
1363 { 1529 {
1364 ev_periodic *w = (ev_periodic *)periodics [i]; 1530 ev_periodic *w = (ev_periodic *)periodics [i];
1365 1531
1366 if (w->reschedule_cb) 1532 if (w->reschedule_cb)
1367 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1533 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1368 else if (w->interval) 1534 else if (w->interval)
1369 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1535 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1370 } 1536 }
1371 1537
1372 /* now rebuild the heap */ 1538 /* now rebuild the heap */
1373 for (i = periodiccnt >> 1; i--; ) 1539 for (i = periodiccnt >> 1; i--; )
1374 downheap (periodics, periodiccnt, i); 1540 downheap (periodics, periodiccnt, i);
… …
1456 { 1622 {
1457#if EV_PERIODIC_ENABLE 1623#if EV_PERIODIC_ENABLE
1458 periodics_reschedule (EV_A); 1624 periodics_reschedule (EV_A);
1459#endif 1625#endif
1460 /* adjust timers. this is easy, as the offset is the same for all of them */ 1626 /* adjust timers. this is easy, as the offset is the same for all of them */
1461 for (i = 0; i < timercnt; ++i) 1627 for (i = 1; i <= timercnt; ++i)
1462 ((WT)timers [i])->at += ev_rt_now - mn_now; 1628 ev_at (timers [i]) += ev_rt_now - mn_now;
1463 } 1629 }
1464 1630
1465 mn_now = ev_rt_now; 1631 mn_now = ev_rt_now;
1466 } 1632 }
1467} 1633}
… …
1481static int loop_done; 1647static int loop_done;
1482 1648
1483void 1649void
1484ev_loop (EV_P_ int flags) 1650ev_loop (EV_P_ int flags)
1485{ 1651{
1486 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1652 loop_done = EVUNLOOP_CANCEL;
1487 ? EVUNLOOP_ONE
1488 : EVUNLOOP_CANCEL;
1489 1653
1490 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1654 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1491 1655
1492 do 1656 do
1493 { 1657 {
… …
1539 1703
1540 waittime = MAX_BLOCKTIME; 1704 waittime = MAX_BLOCKTIME;
1541 1705
1542 if (timercnt) 1706 if (timercnt)
1543 { 1707 {
1544 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1708 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1545 if (waittime > to) waittime = to; 1709 if (waittime > to) waittime = to;
1546 } 1710 }
1547 1711
1548#if EV_PERIODIC_ENABLE 1712#if EV_PERIODIC_ENABLE
1549 if (periodiccnt) 1713 if (periodiccnt)
1550 { 1714 {
1551 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1715 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge;
1552 if (waittime > to) waittime = to; 1716 if (waittime > to) waittime = to;
1553 } 1717 }
1554#endif 1718#endif
1555 1719
1556 if (expect_false (waittime < timeout_blocktime)) 1720 if (expect_false (waittime < timeout_blocktime))
… …
1589 /* queue check watchers, to be executed first */ 1753 /* queue check watchers, to be executed first */
1590 if (expect_false (checkcnt)) 1754 if (expect_false (checkcnt))
1591 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1755 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1592 1756
1593 call_pending (EV_A); 1757 call_pending (EV_A);
1594
1595 } 1758 }
1596 while (expect_true (activecnt && !loop_done)); 1759 while (expect_true (
1760 activecnt
1761 && !loop_done
1762 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1763 ));
1597 1764
1598 if (loop_done == EVUNLOOP_ONE) 1765 if (loop_done == EVUNLOOP_ONE)
1599 loop_done = EVUNLOOP_CANCEL; 1766 loop_done = EVUNLOOP_CANCEL;
1600} 1767}
1601 1768
… …
1719ev_timer_start (EV_P_ ev_timer *w) 1886ev_timer_start (EV_P_ ev_timer *w)
1720{ 1887{
1721 if (expect_false (ev_is_active (w))) 1888 if (expect_false (ev_is_active (w)))
1722 return; 1889 return;
1723 1890
1724 ((WT)w)->at += mn_now; 1891 ev_at (w) += mn_now;
1725 1892
1726 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1893 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1727 1894
1728 ev_start (EV_A_ (W)w, ++timercnt); 1895 ev_start (EV_A_ (W)w, ++timercnt);
1729 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1896 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1730 timers [timercnt - 1] = (WT)w; 1897 timers [timercnt] = (WT)w;
1731 upheap (timers, timercnt - 1); 1898 upheap (timers, timercnt);
1732 1899
1733 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1900 /*assert (("internal timer heap corruption", timers [((W)w)->active] == w));*/
1734} 1901}
1735 1902
1736void noinline 1903void noinline
1737ev_timer_stop (EV_P_ ev_timer *w) 1904ev_timer_stop (EV_P_ ev_timer *w)
1738{ 1905{
1739 clear_pending (EV_A_ (W)w); 1906 clear_pending (EV_A_ (W)w);
1740 if (expect_false (!ev_is_active (w))) 1907 if (expect_false (!ev_is_active (w)))
1741 return; 1908 return;
1742 1909
1743 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w)); 1910 assert (("internal timer heap corruption", timers [((W)w)->active] == (WT)w));
1744 1911
1745 { 1912 {
1746 int active = ((W)w)->active; 1913 int active = ((W)w)->active;
1747 1914
1748 if (expect_true (--active < --timercnt)) 1915 if (expect_true (active < timercnt))
1749 { 1916 {
1750 timers [active] = timers [timercnt]; 1917 timers [active] = timers [timercnt];
1751 adjustheap (timers, timercnt, active); 1918 adjustheap (timers, timercnt, active);
1752 } 1919 }
1920
1921 --timercnt;
1753 } 1922 }
1754 1923
1755 ((WT)w)->at -= mn_now; 1924 ev_at (w) -= mn_now;
1756 1925
1757 ev_stop (EV_A_ (W)w); 1926 ev_stop (EV_A_ (W)w);
1758} 1927}
1759 1928
1760void noinline 1929void noinline
… …
1762{ 1931{
1763 if (ev_is_active (w)) 1932 if (ev_is_active (w))
1764 { 1933 {
1765 if (w->repeat) 1934 if (w->repeat)
1766 { 1935 {
1767 ((WT)w)->at = mn_now + w->repeat; 1936 ev_at (w) = mn_now + w->repeat;
1768 adjustheap (timers, timercnt, ((W)w)->active - 1); 1937 adjustheap (timers, timercnt, ((W)w)->active);
1769 } 1938 }
1770 else 1939 else
1771 ev_timer_stop (EV_A_ w); 1940 ev_timer_stop (EV_A_ w);
1772 } 1941 }
1773 else if (w->repeat) 1942 else if (w->repeat)
1774 { 1943 {
1775 w->at = w->repeat; 1944 ev_at (w) = w->repeat;
1776 ev_timer_start (EV_A_ w); 1945 ev_timer_start (EV_A_ w);
1777 } 1946 }
1778} 1947}
1779 1948
1780#if EV_PERIODIC_ENABLE 1949#if EV_PERIODIC_ENABLE
… …
1783{ 1952{
1784 if (expect_false (ev_is_active (w))) 1953 if (expect_false (ev_is_active (w)))
1785 return; 1954 return;
1786 1955
1787 if (w->reschedule_cb) 1956 if (w->reschedule_cb)
1788 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1957 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1789 else if (w->interval) 1958 else if (w->interval)
1790 { 1959 {
1791 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1960 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1792 /* this formula differs from the one in periodic_reify because we do not always round up */ 1961 /* this formula differs from the one in periodic_reify because we do not always round up */
1793 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1962 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1794 } 1963 }
1795 else 1964 else
1796 ((WT)w)->at = w->offset; 1965 ev_at (w) = w->offset;
1797 1966
1798 ev_start (EV_A_ (W)w, ++periodiccnt); 1967 ev_start (EV_A_ (W)w, ++periodiccnt);
1799 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 1968 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1800 periodics [periodiccnt - 1] = (WT)w; 1969 periodics [periodiccnt] = (WT)w;
1801 upheap (periodics, periodiccnt - 1); 1970 upheap (periodics, periodiccnt);
1802 1971
1803 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1972 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1804} 1973}
1805 1974
1806void noinline 1975void noinline
… …
1808{ 1977{
1809 clear_pending (EV_A_ (W)w); 1978 clear_pending (EV_A_ (W)w);
1810 if (expect_false (!ev_is_active (w))) 1979 if (expect_false (!ev_is_active (w)))
1811 return; 1980 return;
1812 1981
1813 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w)); 1982 assert (("internal periodic heap corruption", periodics [((W)w)->active] == (WT)w));
1814 1983
1815 { 1984 {
1816 int active = ((W)w)->active; 1985 int active = ((W)w)->active;
1817 1986
1818 if (expect_true (--active < --periodiccnt)) 1987 if (expect_true (active < periodiccnt))
1819 { 1988 {
1820 periodics [active] = periodics [periodiccnt]; 1989 periodics [active] = periodics [periodiccnt];
1821 adjustheap (periodics, periodiccnt, active); 1990 adjustheap (periodics, periodiccnt, active);
1822 } 1991 }
1992
1993 --periodiccnt;
1823 } 1994 }
1824 1995
1825 ev_stop (EV_A_ (W)w); 1996 ev_stop (EV_A_ (W)w);
1826} 1997}
1827 1998
… …
1846#endif 2017#endif
1847 if (expect_false (ev_is_active (w))) 2018 if (expect_false (ev_is_active (w)))
1848 return; 2019 return;
1849 2020
1850 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2021 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2022
2023 evpipe_init (EV_A);
1851 2024
1852 { 2025 {
1853#ifndef _WIN32 2026#ifndef _WIN32
1854 sigset_t full, prev; 2027 sigset_t full, prev;
1855 sigfillset (&full); 2028 sigfillset (&full);
… …
1867 wlist_add (&signals [w->signum - 1].head, (WL)w); 2040 wlist_add (&signals [w->signum - 1].head, (WL)w);
1868 2041
1869 if (!((WL)w)->next) 2042 if (!((WL)w)->next)
1870 { 2043 {
1871#if _WIN32 2044#if _WIN32
1872 signal (w->signum, sighandler); 2045 signal (w->signum, ev_sighandler);
1873#else 2046#else
1874 struct sigaction sa; 2047 struct sigaction sa;
1875 sa.sa_handler = sighandler; 2048 sa.sa_handler = ev_sighandler;
1876 sigfillset (&sa.sa_mask); 2049 sigfillset (&sa.sa_mask);
1877 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2050 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1878 sigaction (w->signum, &sa, 0); 2051 sigaction (w->signum, &sa, 0);
1879#endif 2052#endif
1880 } 2053 }
… …
2369 2542
2370 ev_stop (EV_A_ (W)w); 2543 ev_stop (EV_A_ (W)w);
2371} 2544}
2372#endif 2545#endif
2373 2546
2547#if EV_ASYNC_ENABLE
2548void
2549ev_async_start (EV_P_ ev_async *w)
2550{
2551 if (expect_false (ev_is_active (w)))
2552 return;
2553
2554 evpipe_init (EV_A);
2555
2556 ev_start (EV_A_ (W)w, ++asynccnt);
2557 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2558 asyncs [asynccnt - 1] = w;
2559}
2560
2561void
2562ev_async_stop (EV_P_ ev_async *w)
2563{
2564 clear_pending (EV_A_ (W)w);
2565 if (expect_false (!ev_is_active (w)))
2566 return;
2567
2568 {
2569 int active = ((W)w)->active;
2570 asyncs [active - 1] = asyncs [--asynccnt];
2571 ((W)asyncs [active - 1])->active = active;
2572 }
2573
2574 ev_stop (EV_A_ (W)w);
2575}
2576
2577void
2578ev_async_send (EV_P_ ev_async *w)
2579{
2580 w->sent = 1;
2581 evpipe_write (EV_A_ &gotasync);
2582}
2583#endif
2584
2374/*****************************************************************************/ 2585/*****************************************************************************/
2375 2586
2376struct ev_once 2587struct ev_once
2377{ 2588{
2378 ev_io io; 2589 ev_io io;

Diff Legend

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