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

Comparing libev/ev.c (file contents):
Revision 1.197 by root, Sat Dec 22 15:20:13 2007 UTC vs.
Revision 1.232 by root, Tue May 6 15:29:58 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);
… …
454#endif 519#endif
455 } 520 }
456} 521}
457 522
458/*****************************************************************************/ 523/*****************************************************************************/
524
525#define MALLOC_ROUND 4096 // prefer to allocate in chunks of this size, must be 2**n and >> 4 longs
459 526
460int inline_size 527int inline_size
461array_nextsize (int elem, int cur, int cnt) 528array_nextsize (int elem, int cur, int cnt)
462{ 529{
463 int ncur = cur + 1; 530 int ncur = cur + 1;
464 531
465 do 532 do
466 ncur <<= 1; 533 ncur <<= 1;
467 while (cnt > ncur); 534 while (cnt > ncur);
468 535
469 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 536 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
470 if (elem * ncur > 4096) 537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
471 { 538 {
472 ncur *= elem; 539 ncur *= elem;
473 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
474 ncur = ncur - sizeof (void *) * 4; 541 ncur = ncur - sizeof (void *) * 4;
475 ncur /= elem; 542 ncur /= elem;
476 } 543 }
477 544
478 return ncur; 545 return ncur;
… …
590 657
591#if EV_SELECT_IS_WINSOCKET 658#if EV_SELECT_IS_WINSOCKET
592 if (events) 659 if (events)
593 { 660 {
594 unsigned long argp; 661 unsigned long argp;
662 #ifdef EV_FD_TO_WIN32_HANDLE
663 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
664 #else
595 anfd->handle = _get_osfhandle (fd); 665 anfd->handle = _get_osfhandle (fd);
666 #endif
596 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 667 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
597 } 668 }
598#endif 669#endif
599 670
600 { 671 {
… …
688 } 759 }
689} 760}
690 761
691/*****************************************************************************/ 762/*****************************************************************************/
692 763
764/* towards the root */
693void inline_speed 765void inline_speed
694upheap (WT *heap, int k) 766upheap (WT *heap, int k)
695{ 767{
696 WT w = heap [k]; 768 WT w = heap [k];
697 769
698 while (k) 770 for (;;)
699 { 771 {
700 int p = (k - 1) >> 1; 772 int p = k >> 1;
701 773
774 /* maybe we could use a dummy element at heap [0]? */
702 if (heap [p]->at <= w->at) 775 if (!p || heap [p]->at <= w->at)
703 break; 776 break;
704 777
705 heap [k] = heap [p]; 778 heap [k] = heap [p];
706 ((W)heap [k])->active = k + 1; 779 ev_active (heap [k]) = k;
707 k = p; 780 k = p;
708 } 781 }
709 782
710 heap [k] = w; 783 heap [k] = w;
711 ((W)heap [k])->active = k + 1; 784 ev_active (heap [k]) = k;
712} 785}
713 786
787/* away from the root */
714void inline_speed 788void inline_speed
715downheap (WT *heap, int N, int k) 789downheap (WT *heap, int N, int k)
716{ 790{
717 WT w = heap [k]; 791 WT w = heap [k];
718 792
719 for (;;) 793 for (;;)
720 { 794 {
721 int c = (k << 1) + 1; 795 int c = k << 1;
722 796
723 if (c >= N) 797 if (c > N)
724 break; 798 break;
725 799
726 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 800 c += c < N && heap [c]->at > heap [c + 1]->at
727 ? 1 : 0; 801 ? 1 : 0;
728 802
729 if (w->at <= heap [c]->at) 803 if (w->at <= heap [c]->at)
730 break; 804 break;
731 805
732 heap [k] = heap [c]; 806 heap [k] = heap [c];
733 ((W)heap [k])->active = k + 1; 807 ev_active (heap [k]) = k;
734 808
735 k = c; 809 k = c;
736 } 810 }
737 811
738 heap [k] = w; 812 heap [k] = w;
739 ((W)heap [k])->active = k + 1; 813 ev_active (heap [k]) = k;
740} 814}
741 815
742void inline_size 816void inline_size
743adjustheap (WT *heap, int N, int k) 817adjustheap (WT *heap, int N, int k)
744{ 818{
… …
749/*****************************************************************************/ 823/*****************************************************************************/
750 824
751typedef struct 825typedef struct
752{ 826{
753 WL head; 827 WL head;
754 sig_atomic_t volatile gotsig; 828 EV_ATOMIC_T gotsig;
755} ANSIG; 829} ANSIG;
756 830
757static ANSIG *signals; 831static ANSIG *signals;
758static int signalmax; 832static int signalmax;
759 833
760static int sigpipe [2]; 834static EV_ATOMIC_T gotsig;
761static sig_atomic_t volatile gotsig;
762static ev_io sigev;
763 835
764void inline_size 836void inline_size
765signals_init (ANSIG *base, int count) 837signals_init (ANSIG *base, int count)
766{ 838{
767 while (count--) 839 while (count--)
… …
771 843
772 ++base; 844 ++base;
773 } 845 }
774} 846}
775 847
776static void 848/*****************************************************************************/
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 849
827void inline_speed 850void inline_speed
828fd_intern (int fd) 851fd_intern (int fd)
829{ 852{
830#ifdef _WIN32 853#ifdef _WIN32
… …
835 fcntl (fd, F_SETFL, O_NONBLOCK); 858 fcntl (fd, F_SETFL, O_NONBLOCK);
836#endif 859#endif
837} 860}
838 861
839static void noinline 862static void noinline
840siginit (EV_P) 863evpipe_init (EV_P)
841{ 864{
865 if (!ev_is_active (&pipeev))
866 {
867#if EV_USE_EVENTFD
868 if ((evfd = eventfd (0, 0)) >= 0)
869 {
870 evpipe [0] = -1;
871 fd_intern (evfd);
872 ev_io_set (&pipeev, evfd, EV_READ);
873 }
874 else
875#endif
876 {
877 while (pipe (evpipe))
878 syserr ("(libev) error creating signal/async pipe");
879
842 fd_intern (sigpipe [0]); 880 fd_intern (evpipe [0]);
843 fd_intern (sigpipe [1]); 881 fd_intern (evpipe [1]);
882 ev_io_set (&pipeev, evpipe [0], EV_READ);
883 }
844 884
845 ev_io_set (&sigev, sigpipe [0], EV_READ);
846 ev_io_start (EV_A_ &sigev); 885 ev_io_start (EV_A_ &pipeev);
847 ev_unref (EV_A); /* child watcher should not keep loop alive */ 886 ev_unref (EV_A); /* watcher should not keep loop alive */
887 }
888}
889
890void inline_size
891evpipe_write (EV_P_ EV_ATOMIC_T *flag)
892{
893 if (!*flag)
894 {
895 int old_errno = errno; /* save errno because write might clobber it */
896
897 *flag = 1;
898
899#if EV_USE_EVENTFD
900 if (evfd >= 0)
901 {
902 uint64_t counter = 1;
903 write (evfd, &counter, sizeof (uint64_t));
904 }
905 else
906#endif
907 write (evpipe [1], &old_errno, 1);
908
909 errno = old_errno;
910 }
911}
912
913static void
914pipecb (EV_P_ ev_io *iow, int revents)
915{
916#if EV_USE_EVENTFD
917 if (evfd >= 0)
918 {
919 uint64_t counter;
920 read (evfd, &counter, sizeof (uint64_t));
921 }
922 else
923#endif
924 {
925 char dummy;
926 read (evpipe [0], &dummy, 1);
927 }
928
929 if (gotsig && ev_is_default_loop (EV_A))
930 {
931 int signum;
932 gotsig = 0;
933
934 for (signum = signalmax; signum--; )
935 if (signals [signum].gotsig)
936 ev_feed_signal_event (EV_A_ signum + 1);
937 }
938
939#if EV_ASYNC_ENABLE
940 if (gotasync)
941 {
942 int i;
943 gotasync = 0;
944
945 for (i = asynccnt; i--; )
946 if (asyncs [i]->sent)
947 {
948 asyncs [i]->sent = 0;
949 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
950 }
951 }
952#endif
848} 953}
849 954
850/*****************************************************************************/ 955/*****************************************************************************/
851 956
957static void
958ev_sighandler (int signum)
959{
960#if EV_MULTIPLICITY
961 struct ev_loop *loop = &default_loop_struct;
962#endif
963
964#if _WIN32
965 signal (signum, ev_sighandler);
966#endif
967
968 signals [signum - 1].gotsig = 1;
969 evpipe_write (EV_A_ &gotsig);
970}
971
972void noinline
973ev_feed_signal_event (EV_P_ int signum)
974{
975 WL w;
976
977#if EV_MULTIPLICITY
978 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
979#endif
980
981 --signum;
982
983 if (signum < 0 || signum >= signalmax)
984 return;
985
986 signals [signum].gotsig = 0;
987
988 for (w = signals [signum].head; w; w = w->next)
989 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
990}
991
992/*****************************************************************************/
993
852static WL childs [EV_PID_HASHSIZE]; 994static WL childs [EV_PID_HASHSIZE];
853 995
854#ifndef _WIN32 996#ifndef _WIN32
855 997
856static ev_signal childev; 998static ev_signal childev;
857 999
1000#ifndef WIFCONTINUED
1001# define WIFCONTINUED(status) 0
1002#endif
1003
858void inline_speed 1004void inline_speed
859child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1005child_reap (EV_P_ int chain, int pid, int status)
860{ 1006{
861 ev_child *w; 1007 ev_child *w;
1008 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
862 1009
863 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1010 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1011 {
864 if (w->pid == pid || !w->pid) 1012 if ((w->pid == pid || !w->pid)
1013 && (!traced || (w->flags & 1)))
865 { 1014 {
866 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1015 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; 1016 w->rpid = pid;
868 w->rstatus = status; 1017 w->rstatus = status;
869 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1018 ev_feed_event (EV_A_ (W)w, EV_CHILD);
870 } 1019 }
1020 }
871} 1021}
872 1022
873#ifndef WCONTINUED 1023#ifndef WCONTINUED
874# define WCONTINUED 0 1024# define WCONTINUED 0
875#endif 1025#endif
… …
884 if (!WCONTINUED 1034 if (!WCONTINUED
885 || errno != EINVAL 1035 || errno != EINVAL
886 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1036 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
887 return; 1037 return;
888 1038
889 /* make sure we are called again until all childs have been reaped */ 1039 /* 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 */ 1040 /* 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); 1041 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
892 1042
893 child_reap (EV_A_ sw, pid, pid, status); 1043 child_reap (EV_A_ pid, pid, status);
894 if (EV_PID_HASHSIZE > 1) 1044 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 */ 1045 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
896} 1046}
897 1047
898#endif 1048#endif
899 1049
900/*****************************************************************************/ 1050/*****************************************************************************/
… …
1018 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1168 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1019 have_monotonic = 1; 1169 have_monotonic = 1;
1020 } 1170 }
1021#endif 1171#endif
1022 1172
1023 ev_rt_now = ev_time (); 1173 ev_rt_now = ev_time ();
1024 mn_now = get_clock (); 1174 mn_now = get_clock ();
1025 now_floor = mn_now; 1175 now_floor = mn_now;
1026 rtmn_diff = ev_rt_now - mn_now; 1176 rtmn_diff = ev_rt_now - mn_now;
1027 1177
1028 io_blocktime = 0.; 1178 io_blocktime = 0.;
1029 timeout_blocktime = 0.; 1179 timeout_blocktime = 0.;
1180 backend = 0;
1181 backend_fd = -1;
1182 gotasync = 0;
1183#if EV_USE_INOTIFY
1184 fs_fd = -2;
1185#endif
1030 1186
1031 /* pid check not overridable via env */ 1187 /* pid check not overridable via env */
1032#ifndef _WIN32 1188#ifndef _WIN32
1033 if (flags & EVFLAG_FORKCHECK) 1189 if (flags & EVFLAG_FORKCHECK)
1034 curpid = getpid (); 1190 curpid = getpid ();
… …
1037 if (!(flags & EVFLAG_NOENV) 1193 if (!(flags & EVFLAG_NOENV)
1038 && !enable_secure () 1194 && !enable_secure ()
1039 && getenv ("LIBEV_FLAGS")) 1195 && getenv ("LIBEV_FLAGS"))
1040 flags = atoi (getenv ("LIBEV_FLAGS")); 1196 flags = atoi (getenv ("LIBEV_FLAGS"));
1041 1197
1042 if (!(flags & 0x0000ffffUL)) 1198 if (!(flags & 0x0000ffffU))
1043 flags |= ev_recommended_backends (); 1199 flags |= ev_recommended_backends ();
1044
1045 backend = 0;
1046 backend_fd = -1;
1047#if EV_USE_INOTIFY
1048 fs_fd = -2;
1049#endif
1050 1200
1051#if EV_USE_PORT 1201#if EV_USE_PORT
1052 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1202 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1053#endif 1203#endif
1054#if EV_USE_KQUEUE 1204#if EV_USE_KQUEUE
… …
1062#endif 1212#endif
1063#if EV_USE_SELECT 1213#if EV_USE_SELECT
1064 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1214 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1065#endif 1215#endif
1066 1216
1067 ev_init (&sigev, sigcb); 1217 ev_init (&pipeev, pipecb);
1068 ev_set_priority (&sigev, EV_MAXPRI); 1218 ev_set_priority (&pipeev, EV_MAXPRI);
1069 } 1219 }
1070} 1220}
1071 1221
1072static void noinline 1222static void noinline
1073loop_destroy (EV_P) 1223loop_destroy (EV_P)
1074{ 1224{
1075 int i; 1225 int i;
1226
1227 if (ev_is_active (&pipeev))
1228 {
1229 ev_ref (EV_A); /* signal watcher */
1230 ev_io_stop (EV_A_ &pipeev);
1231
1232#if EV_USE_EVENTFD
1233 if (evfd >= 0)
1234 close (evfd);
1235#endif
1236
1237 if (evpipe [0] >= 0)
1238 {
1239 close (evpipe [0]);
1240 close (evpipe [1]);
1241 }
1242 }
1076 1243
1077#if EV_USE_INOTIFY 1244#if EV_USE_INOTIFY
1078 if (fs_fd >= 0) 1245 if (fs_fd >= 0)
1079 close (fs_fd); 1246 close (fs_fd);
1080#endif 1247#endif
… …
1117#if EV_FORK_ENABLE 1284#if EV_FORK_ENABLE
1118 array_free (fork, EMPTY); 1285 array_free (fork, EMPTY);
1119#endif 1286#endif
1120 array_free (prepare, EMPTY); 1287 array_free (prepare, EMPTY);
1121 array_free (check, EMPTY); 1288 array_free (check, EMPTY);
1289#if EV_ASYNC_ENABLE
1290 array_free (async, EMPTY);
1291#endif
1122 1292
1123 backend = 0; 1293 backend = 0;
1124} 1294}
1125 1295
1296#if EV_USE_INOTIFY
1126void inline_size infy_fork (EV_P); 1297void inline_size infy_fork (EV_P);
1298#endif
1127 1299
1128void inline_size 1300void inline_size
1129loop_fork (EV_P) 1301loop_fork (EV_P)
1130{ 1302{
1131#if EV_USE_PORT 1303#if EV_USE_PORT
… …
1139#endif 1311#endif
1140#if EV_USE_INOTIFY 1312#if EV_USE_INOTIFY
1141 infy_fork (EV_A); 1313 infy_fork (EV_A);
1142#endif 1314#endif
1143 1315
1144 if (ev_is_active (&sigev)) 1316 if (ev_is_active (&pipeev))
1145 { 1317 {
1146 /* default loop */ 1318 /* this "locks" the handlers against writing to the pipe */
1319 /* while we modify the fd vars */
1320 gotsig = 1;
1321#if EV_ASYNC_ENABLE
1322 gotasync = 1;
1323#endif
1147 1324
1148 ev_ref (EV_A); 1325 ev_ref (EV_A);
1149 ev_io_stop (EV_A_ &sigev); 1326 ev_io_stop (EV_A_ &pipeev);
1327
1328#if EV_USE_EVENTFD
1329 if (evfd >= 0)
1330 close (evfd);
1331#endif
1332
1333 if (evpipe [0] >= 0)
1334 {
1150 close (sigpipe [0]); 1335 close (evpipe [0]);
1151 close (sigpipe [1]); 1336 close (evpipe [1]);
1337 }
1152 1338
1153 while (pipe (sigpipe))
1154 syserr ("(libev) error creating pipe");
1155
1156 siginit (EV_A); 1339 evpipe_init (EV_A);
1340 /* now iterate over everything, in case we missed something */
1341 pipecb (EV_A_ &pipeev, EV_READ);
1157 } 1342 }
1158 1343
1159 postfork = 0; 1344 postfork = 0;
1160} 1345}
1161 1346
… …
1183} 1368}
1184 1369
1185void 1370void
1186ev_loop_fork (EV_P) 1371ev_loop_fork (EV_P)
1187{ 1372{
1188 postfork = 1; 1373 postfork = 1; /* must be in line with ev_default_fork */
1189} 1374}
1190 1375
1191#endif 1376#endif
1192 1377
1193#if EV_MULTIPLICITY 1378#if EV_MULTIPLICITY
… …
1196#else 1381#else
1197int 1382int
1198ev_default_loop (unsigned int flags) 1383ev_default_loop (unsigned int flags)
1199#endif 1384#endif
1200{ 1385{
1201 if (sigpipe [0] == sigpipe [1])
1202 if (pipe (sigpipe))
1203 return 0;
1204
1205 if (!ev_default_loop_ptr) 1386 if (!ev_default_loop_ptr)
1206 { 1387 {
1207#if EV_MULTIPLICITY 1388#if EV_MULTIPLICITY
1208 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1389 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1209#else 1390#else
… …
1212 1393
1213 loop_init (EV_A_ flags); 1394 loop_init (EV_A_ flags);
1214 1395
1215 if (ev_backend (EV_A)) 1396 if (ev_backend (EV_A))
1216 { 1397 {
1217 siginit (EV_A);
1218
1219#ifndef _WIN32 1398#ifndef _WIN32
1220 ev_signal_init (&childev, childcb, SIGCHLD); 1399 ev_signal_init (&childev, childcb, SIGCHLD);
1221 ev_set_priority (&childev, EV_MAXPRI); 1400 ev_set_priority (&childev, EV_MAXPRI);
1222 ev_signal_start (EV_A_ &childev); 1401 ev_signal_start (EV_A_ &childev);
1223 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1402 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1240#ifndef _WIN32 1419#ifndef _WIN32
1241 ev_ref (EV_A); /* child watcher */ 1420 ev_ref (EV_A); /* child watcher */
1242 ev_signal_stop (EV_A_ &childev); 1421 ev_signal_stop (EV_A_ &childev);
1243#endif 1422#endif
1244 1423
1245 ev_ref (EV_A); /* signal watcher */
1246 ev_io_stop (EV_A_ &sigev);
1247
1248 close (sigpipe [0]); sigpipe [0] = 0;
1249 close (sigpipe [1]); sigpipe [1] = 0;
1250
1251 loop_destroy (EV_A); 1424 loop_destroy (EV_A);
1252} 1425}
1253 1426
1254void 1427void
1255ev_default_fork (void) 1428ev_default_fork (void)
… …
1257#if EV_MULTIPLICITY 1430#if EV_MULTIPLICITY
1258 struct ev_loop *loop = ev_default_loop_ptr; 1431 struct ev_loop *loop = ev_default_loop_ptr;
1259#endif 1432#endif
1260 1433
1261 if (backend) 1434 if (backend)
1262 postfork = 1; 1435 postfork = 1; /* must be in line with ev_loop_fork */
1263} 1436}
1264 1437
1265/*****************************************************************************/ 1438/*****************************************************************************/
1266 1439
1267void 1440void
… …
1291} 1464}
1292 1465
1293void inline_size 1466void inline_size
1294timers_reify (EV_P) 1467timers_reify (EV_P)
1295{ 1468{
1296 while (timercnt && ((WT)timers [0])->at <= mn_now) 1469 while (timercnt && ev_at (timers [1]) <= mn_now)
1297 { 1470 {
1298 ev_timer *w = (ev_timer *)timers [0]; 1471 ev_timer *w = (ev_timer *)timers [1];
1299 1472
1300 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1473 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1301 1474
1302 /* first reschedule or stop timer */ 1475 /* first reschedule or stop timer */
1303 if (w->repeat) 1476 if (w->repeat)
1304 { 1477 {
1305 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1478 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1306 1479
1307 ((WT)w)->at += w->repeat; 1480 ev_at (w) += w->repeat;
1308 if (((WT)w)->at < mn_now) 1481 if (ev_at (w) < mn_now)
1309 ((WT)w)->at = mn_now; 1482 ev_at (w) = mn_now;
1310 1483
1311 downheap (timers, timercnt, 0); 1484 downheap (timers, timercnt, 1);
1312 } 1485 }
1313 else 1486 else
1314 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1487 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1315 1488
1316 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1489 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1319 1492
1320#if EV_PERIODIC_ENABLE 1493#if EV_PERIODIC_ENABLE
1321void inline_size 1494void inline_size
1322periodics_reify (EV_P) 1495periodics_reify (EV_P)
1323{ 1496{
1324 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1497 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1325 { 1498 {
1326 ev_periodic *w = (ev_periodic *)periodics [0]; 1499 ev_periodic *w = (ev_periodic *)periodics [1];
1327 1500
1328 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1501 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1329 1502
1330 /* first reschedule or stop timer */ 1503 /* first reschedule or stop timer */
1331 if (w->reschedule_cb) 1504 if (w->reschedule_cb)
1332 { 1505 {
1333 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1506 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1334 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1507 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1335 downheap (periodics, periodiccnt, 0); 1508 downheap (periodics, periodiccnt, 1);
1336 } 1509 }
1337 else if (w->interval) 1510 else if (w->interval)
1338 { 1511 {
1339 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1512 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1340 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval; 1513 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1341 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1514 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1342 downheap (periodics, periodiccnt, 0); 1515 downheap (periodics, periodiccnt, 1);
1343 } 1516 }
1344 else 1517 else
1345 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1518 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1346 1519
1347 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1520 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1352periodics_reschedule (EV_P) 1525periodics_reschedule (EV_P)
1353{ 1526{
1354 int i; 1527 int i;
1355 1528
1356 /* adjust periodics after time jump */ 1529 /* adjust periodics after time jump */
1357 for (i = 0; i < periodiccnt; ++i) 1530 for (i = 1; i <= periodiccnt; ++i)
1358 { 1531 {
1359 ev_periodic *w = (ev_periodic *)periodics [i]; 1532 ev_periodic *w = (ev_periodic *)periodics [i];
1360 1533
1361 if (w->reschedule_cb) 1534 if (w->reschedule_cb)
1362 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1535 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1363 else if (w->interval) 1536 else if (w->interval)
1364 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1537 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1365 } 1538 }
1366 1539
1367 /* now rebuild the heap */ 1540 /* now rebuild the heap */
1368 for (i = periodiccnt >> 1; i--; ) 1541 for (i = periodiccnt >> 1; i--; )
1369 downheap (periodics, periodiccnt, i); 1542 downheap (periodics, periodiccnt, i);
… …
1451 { 1624 {
1452#if EV_PERIODIC_ENABLE 1625#if EV_PERIODIC_ENABLE
1453 periodics_reschedule (EV_A); 1626 periodics_reschedule (EV_A);
1454#endif 1627#endif
1455 /* adjust timers. this is easy, as the offset is the same for all of them */ 1628 /* adjust timers. this is easy, as the offset is the same for all of them */
1456 for (i = 0; i < timercnt; ++i) 1629 for (i = 1; i <= timercnt; ++i)
1457 ((WT)timers [i])->at += ev_rt_now - mn_now; 1630 ev_at (timers [i]) += ev_rt_now - mn_now;
1458 } 1631 }
1459 1632
1460 mn_now = ev_rt_now; 1633 mn_now = ev_rt_now;
1461 } 1634 }
1462} 1635}
… …
1476static int loop_done; 1649static int loop_done;
1477 1650
1478void 1651void
1479ev_loop (EV_P_ int flags) 1652ev_loop (EV_P_ int flags)
1480{ 1653{
1481 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1654 loop_done = EVUNLOOP_CANCEL;
1482 ? EVUNLOOP_ONE
1483 : EVUNLOOP_CANCEL;
1484 1655
1485 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1656 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1486 1657
1487 do 1658 do
1488 { 1659 {
… …
1534 1705
1535 waittime = MAX_BLOCKTIME; 1706 waittime = MAX_BLOCKTIME;
1536 1707
1537 if (timercnt) 1708 if (timercnt)
1538 { 1709 {
1539 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1710 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1540 if (waittime > to) waittime = to; 1711 if (waittime > to) waittime = to;
1541 } 1712 }
1542 1713
1543#if EV_PERIODIC_ENABLE 1714#if EV_PERIODIC_ENABLE
1544 if (periodiccnt) 1715 if (periodiccnt)
1545 { 1716 {
1546 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1717 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge;
1547 if (waittime > to) waittime = to; 1718 if (waittime > to) waittime = to;
1548 } 1719 }
1549#endif 1720#endif
1550 1721
1551 if (expect_false (waittime < timeout_blocktime)) 1722 if (expect_false (waittime < timeout_blocktime))
… …
1584 /* queue check watchers, to be executed first */ 1755 /* queue check watchers, to be executed first */
1585 if (expect_false (checkcnt)) 1756 if (expect_false (checkcnt))
1586 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1757 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1587 1758
1588 call_pending (EV_A); 1759 call_pending (EV_A);
1589
1590 } 1760 }
1591 while (expect_true (activecnt && !loop_done)); 1761 while (expect_true (
1762 activecnt
1763 && !loop_done
1764 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1765 ));
1592 1766
1593 if (loop_done == EVUNLOOP_ONE) 1767 if (loop_done == EVUNLOOP_ONE)
1594 loop_done = EVUNLOOP_CANCEL; 1768 loop_done = EVUNLOOP_CANCEL;
1595} 1769}
1596 1770
… …
1714ev_timer_start (EV_P_ ev_timer *w) 1888ev_timer_start (EV_P_ ev_timer *w)
1715{ 1889{
1716 if (expect_false (ev_is_active (w))) 1890 if (expect_false (ev_is_active (w)))
1717 return; 1891 return;
1718 1892
1719 ((WT)w)->at += mn_now; 1893 ev_at (w) += mn_now;
1720 1894
1721 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1895 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1722 1896
1723 ev_start (EV_A_ (W)w, ++timercnt); 1897 ev_start (EV_A_ (W)w, ++timercnt);
1724 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1898 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1725 timers [timercnt - 1] = (WT)w; 1899 timers [timercnt] = (WT)w;
1726 upheap (timers, timercnt - 1); 1900 upheap (timers, timercnt);
1727 1901
1728 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1902 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1729} 1903}
1730 1904
1731void noinline 1905void noinline
1732ev_timer_stop (EV_P_ ev_timer *w) 1906ev_timer_stop (EV_P_ ev_timer *w)
1733{ 1907{
1734 clear_pending (EV_A_ (W)w); 1908 clear_pending (EV_A_ (W)w);
1735 if (expect_false (!ev_is_active (w))) 1909 if (expect_false (!ev_is_active (w)))
1736 return; 1910 return;
1737 1911
1738 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1739
1740 { 1912 {
1741 int active = ((W)w)->active; 1913 int active = ev_active (w);
1742 1914
1915 assert (("internal timer heap corruption", timers [active] == (WT)w));
1916
1743 if (expect_true (--active < --timercnt)) 1917 if (expect_true (active < timercnt))
1744 { 1918 {
1745 timers [active] = timers [timercnt]; 1919 timers [active] = timers [timercnt];
1746 adjustheap (timers, timercnt, active); 1920 adjustheap (timers, timercnt, active);
1747 } 1921 }
1922
1923 --timercnt;
1748 } 1924 }
1749 1925
1750 ((WT)w)->at -= mn_now; 1926 ev_at (w) -= mn_now;
1751 1927
1752 ev_stop (EV_A_ (W)w); 1928 ev_stop (EV_A_ (W)w);
1753} 1929}
1754 1930
1755void noinline 1931void noinline
… …
1757{ 1933{
1758 if (ev_is_active (w)) 1934 if (ev_is_active (w))
1759 { 1935 {
1760 if (w->repeat) 1936 if (w->repeat)
1761 { 1937 {
1762 ((WT)w)->at = mn_now + w->repeat; 1938 ev_at (w) = mn_now + w->repeat;
1763 adjustheap (timers, timercnt, ((W)w)->active - 1); 1939 adjustheap (timers, timercnt, ev_active (w));
1764 } 1940 }
1765 else 1941 else
1766 ev_timer_stop (EV_A_ w); 1942 ev_timer_stop (EV_A_ w);
1767 } 1943 }
1768 else if (w->repeat) 1944 else if (w->repeat)
1769 { 1945 {
1770 w->at = w->repeat; 1946 ev_at (w) = w->repeat;
1771 ev_timer_start (EV_A_ w); 1947 ev_timer_start (EV_A_ w);
1772 } 1948 }
1773} 1949}
1774 1950
1775#if EV_PERIODIC_ENABLE 1951#if EV_PERIODIC_ENABLE
… …
1778{ 1954{
1779 if (expect_false (ev_is_active (w))) 1955 if (expect_false (ev_is_active (w)))
1780 return; 1956 return;
1781 1957
1782 if (w->reschedule_cb) 1958 if (w->reschedule_cb)
1783 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1959 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1784 else if (w->interval) 1960 else if (w->interval)
1785 { 1961 {
1786 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1962 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1787 /* this formula differs from the one in periodic_reify because we do not always round up */ 1963 /* this formula differs from the one in periodic_reify because we do not always round up */
1788 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1964 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1789 } 1965 }
1790 else 1966 else
1791 ((WT)w)->at = w->offset; 1967 ev_at (w) = w->offset;
1792 1968
1793 ev_start (EV_A_ (W)w, ++periodiccnt); 1969 ev_start (EV_A_ (W)w, ++periodiccnt);
1794 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 1970 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1795 periodics [periodiccnt - 1] = (WT)w; 1971 periodics [periodiccnt] = (WT)w;
1796 upheap (periodics, periodiccnt - 1); 1972 upheap (periodics, periodiccnt);
1797 1973
1798 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1974 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1799} 1975}
1800 1976
1801void noinline 1977void noinline
1802ev_periodic_stop (EV_P_ ev_periodic *w) 1978ev_periodic_stop (EV_P_ ev_periodic *w)
1803{ 1979{
1804 clear_pending (EV_A_ (W)w); 1980 clear_pending (EV_A_ (W)w);
1805 if (expect_false (!ev_is_active (w))) 1981 if (expect_false (!ev_is_active (w)))
1806 return; 1982 return;
1807 1983
1808 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1809
1810 { 1984 {
1811 int active = ((W)w)->active; 1985 int active = ev_active (w);
1812 1986
1987 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
1988
1813 if (expect_true (--active < --periodiccnt)) 1989 if (expect_true (active < periodiccnt))
1814 { 1990 {
1815 periodics [active] = periodics [periodiccnt]; 1991 periodics [active] = periodics [periodiccnt];
1816 adjustheap (periodics, periodiccnt, active); 1992 adjustheap (periodics, periodiccnt, active);
1817 } 1993 }
1994
1995 --periodiccnt;
1818 } 1996 }
1819 1997
1820 ev_stop (EV_A_ (W)w); 1998 ev_stop (EV_A_ (W)w);
1821} 1999}
1822 2000
… …
1841#endif 2019#endif
1842 if (expect_false (ev_is_active (w))) 2020 if (expect_false (ev_is_active (w)))
1843 return; 2021 return;
1844 2022
1845 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2023 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2024
2025 evpipe_init (EV_A);
1846 2026
1847 { 2027 {
1848#ifndef _WIN32 2028#ifndef _WIN32
1849 sigset_t full, prev; 2029 sigset_t full, prev;
1850 sigfillset (&full); 2030 sigfillset (&full);
… …
1862 wlist_add (&signals [w->signum - 1].head, (WL)w); 2042 wlist_add (&signals [w->signum - 1].head, (WL)w);
1863 2043
1864 if (!((WL)w)->next) 2044 if (!((WL)w)->next)
1865 { 2045 {
1866#if _WIN32 2046#if _WIN32
1867 signal (w->signum, sighandler); 2047 signal (w->signum, ev_sighandler);
1868#else 2048#else
1869 struct sigaction sa; 2049 struct sigaction sa;
1870 sa.sa_handler = sighandler; 2050 sa.sa_handler = ev_sighandler;
1871 sigfillset (&sa.sa_mask); 2051 sigfillset (&sa.sa_mask);
1872 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2052 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1873 sigaction (w->signum, &sa, 0); 2053 sigaction (w->signum, &sa, 0);
1874#endif 2054#endif
1875 } 2055 }
… …
2190 clear_pending (EV_A_ (W)w); 2370 clear_pending (EV_A_ (W)w);
2191 if (expect_false (!ev_is_active (w))) 2371 if (expect_false (!ev_is_active (w)))
2192 return; 2372 return;
2193 2373
2194 { 2374 {
2195 int active = ((W)w)->active; 2375 int active = ev_active (w);
2196 2376
2197 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2377 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2198 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2378 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2199 2379
2200 ev_stop (EV_A_ (W)w); 2380 ev_stop (EV_A_ (W)w);
2201 --idleall; 2381 --idleall;
2202 } 2382 }
2203} 2383}
… …
2220 clear_pending (EV_A_ (W)w); 2400 clear_pending (EV_A_ (W)w);
2221 if (expect_false (!ev_is_active (w))) 2401 if (expect_false (!ev_is_active (w)))
2222 return; 2402 return;
2223 2403
2224 { 2404 {
2225 int active = ((W)w)->active; 2405 int active = ev_active (w);
2406
2226 prepares [active - 1] = prepares [--preparecnt]; 2407 prepares [active - 1] = prepares [--preparecnt];
2227 ((W)prepares [active - 1])->active = active; 2408 ev_active (prepares [active - 1]) = active;
2228 } 2409 }
2229 2410
2230 ev_stop (EV_A_ (W)w); 2411 ev_stop (EV_A_ (W)w);
2231} 2412}
2232 2413
… …
2247 clear_pending (EV_A_ (W)w); 2428 clear_pending (EV_A_ (W)w);
2248 if (expect_false (!ev_is_active (w))) 2429 if (expect_false (!ev_is_active (w)))
2249 return; 2430 return;
2250 2431
2251 { 2432 {
2252 int active = ((W)w)->active; 2433 int active = ev_active (w);
2434
2253 checks [active - 1] = checks [--checkcnt]; 2435 checks [active - 1] = checks [--checkcnt];
2254 ((W)checks [active - 1])->active = active; 2436 ev_active (checks [active - 1]) = active;
2255 } 2437 }
2256 2438
2257 ev_stop (EV_A_ (W)w); 2439 ev_stop (EV_A_ (W)w);
2258} 2440}
2259 2441
… …
2355 clear_pending (EV_A_ (W)w); 2537 clear_pending (EV_A_ (W)w);
2356 if (expect_false (!ev_is_active (w))) 2538 if (expect_false (!ev_is_active (w)))
2357 return; 2539 return;
2358 2540
2359 { 2541 {
2360 int active = ((W)w)->active; 2542 int active = ev_active (w);
2543
2361 forks [active - 1] = forks [--forkcnt]; 2544 forks [active - 1] = forks [--forkcnt];
2362 ((W)forks [active - 1])->active = active; 2545 ev_active (forks [active - 1]) = active;
2363 } 2546 }
2364 2547
2365 ev_stop (EV_A_ (W)w); 2548 ev_stop (EV_A_ (W)w);
2549}
2550#endif
2551
2552#if EV_ASYNC_ENABLE
2553void
2554ev_async_start (EV_P_ ev_async *w)
2555{
2556 if (expect_false (ev_is_active (w)))
2557 return;
2558
2559 evpipe_init (EV_A);
2560
2561 ev_start (EV_A_ (W)w, ++asynccnt);
2562 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2563 asyncs [asynccnt - 1] = w;
2564}
2565
2566void
2567ev_async_stop (EV_P_ ev_async *w)
2568{
2569 clear_pending (EV_A_ (W)w);
2570 if (expect_false (!ev_is_active (w)))
2571 return;
2572
2573 {
2574 int active = ev_active (w);
2575
2576 asyncs [active - 1] = asyncs [--asynccnt];
2577 ev_active (asyncs [active - 1]) = active;
2578 }
2579
2580 ev_stop (EV_A_ (W)w);
2581}
2582
2583void
2584ev_async_send (EV_P_ ev_async *w)
2585{
2586 w->sent = 1;
2587 evpipe_write (EV_A_ &gotasync);
2366} 2588}
2367#endif 2589#endif
2368 2590
2369/*****************************************************************************/ 2591/*****************************************************************************/
2370 2592

Diff Legend

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