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.233 by root, Tue May 6 23:34:16 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
334/* sig_atomic_t is used to avoid per-thread variables or locking but still */
335/* giving it a reasonably high chance of working on typical architetcures */
285static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 336static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
337#endif
286 338
287#ifdef _WIN32 339#ifdef _WIN32
288# include "ev_win32.c" 340# include "ev_win32.c"
289#endif 341#endif
290 342
… …
311 perror (msg); 363 perror (msg);
312 abort (); 364 abort ();
313 } 365 }
314} 366}
315 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
316static void *(*alloc)(void *ptr, long size); 383static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
317 384
318void 385void
319ev_set_allocator (void *(*cb)(void *ptr, long size)) 386ev_set_allocator (void *(*cb)(void *ptr, long size))
320{ 387{
321 alloc = cb; 388 alloc = cb;
322} 389}
323 390
324inline_speed void * 391inline_speed void *
325ev_realloc (void *ptr, long size) 392ev_realloc (void *ptr, long size)
326{ 393{
327 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 394 ptr = alloc (ptr, size);
328 395
329 if (!ptr && size) 396 if (!ptr && size)
330 { 397 {
331 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 398 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
332 abort (); 399 abort ();
… …
439 ts.tv_sec = (time_t)delay; 506 ts.tv_sec = (time_t)delay;
440 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 507 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
441 508
442 nanosleep (&ts, 0); 509 nanosleep (&ts, 0);
443#elif defined(_WIN32) 510#elif defined(_WIN32)
444 Sleep (delay * 1e3); 511 Sleep ((unsigned long)(delay * 1e3));
445#else 512#else
446 struct timeval tv; 513 struct timeval tv;
447 514
448 tv.tv_sec = (time_t)delay; 515 tv.tv_sec = (time_t)delay;
449 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 516 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
452#endif 519#endif
453 } 520 }
454} 521}
455 522
456/*****************************************************************************/ 523/*****************************************************************************/
524
525#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
457 526
458int inline_size 527int inline_size
459array_nextsize (int elem, int cur, int cnt) 528array_nextsize (int elem, int cur, int cnt)
460{ 529{
461 int ncur = cur + 1; 530 int ncur = cur + 1;
462 531
463 do 532 do
464 ncur <<= 1; 533 ncur <<= 1;
465 while (cnt > ncur); 534 while (cnt > ncur);
466 535
467 /* 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 */
468 if (elem * ncur > 4096) 537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
469 { 538 {
470 ncur *= elem; 539 ncur *= elem;
471 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
472 ncur = ncur - sizeof (void *) * 4; 541 ncur = ncur - sizeof (void *) * 4;
473 ncur /= elem; 542 ncur /= elem;
474 } 543 }
475 544
476 return ncur; 545 return ncur;
… …
588 657
589#if EV_SELECT_IS_WINSOCKET 658#if EV_SELECT_IS_WINSOCKET
590 if (events) 659 if (events)
591 { 660 {
592 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
593 anfd->handle = _get_osfhandle (fd); 665 anfd->handle = _get_osfhandle (fd);
666 #endif
594 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));
595 } 668 }
596#endif 669#endif
597 670
598 { 671 {
… …
686 } 759 }
687} 760}
688 761
689/*****************************************************************************/ 762/*****************************************************************************/
690 763
764/* towards the root */
691void inline_speed 765void inline_speed
692upheap (WT *heap, int k) 766upheap (WT *heap, int k)
693{ 767{
694 WT w = heap [k]; 768 WT w = heap [k];
695 769
696 while (k) 770 for (;;)
697 { 771 {
698 int p = (k - 1) >> 1; 772 int p = k >> 1;
699 773
774 /* maybe we could use a dummy element at heap [0]? */
700 if (heap [p]->at <= w->at) 775 if (!p || heap [p]->at <= w->at)
701 break; 776 break;
702 777
703 heap [k] = heap [p]; 778 heap [k] = heap [p];
704 ((W)heap [k])->active = k + 1; 779 ev_active (heap [k]) = k;
705 k = p; 780 k = p;
706 } 781 }
707 782
708 heap [k] = w; 783 heap [k] = w;
709 ((W)heap [k])->active = k + 1; 784 ev_active (heap [k]) = k;
710} 785}
711 786
787/* away from the root */
712void inline_speed 788void inline_speed
713downheap (WT *heap, int N, int k) 789downheap (WT *heap, int N, int k)
714{ 790{
715 WT w = heap [k]; 791 WT w = heap [k];
716 792
717 for (;;) 793 for (;;)
718 { 794 {
719 int c = (k << 1) + 1; 795 int c = k << 1;
720 796
721 if (c >= N) 797 if (c > N)
722 break; 798 break;
723 799
724 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 800 c += c < N && heap [c]->at > heap [c + 1]->at
725 ? 1 : 0; 801 ? 1 : 0;
726 802
727 if (w->at <= heap [c]->at) 803 if (w->at <= heap [c]->at)
728 break; 804 break;
729 805
730 heap [k] = heap [c]; 806 heap [k] = heap [c];
731 ((W)heap [k])->active = k + 1; 807 ev_active (heap [k]) = k;
732 808
733 k = c; 809 k = c;
734 } 810 }
735 811
736 heap [k] = w; 812 heap [k] = w;
737 ((W)heap [k])->active = k + 1; 813 ev_active (heap [k]) = k;
738} 814}
739 815
740void inline_size 816void inline_size
741adjustheap (WT *heap, int N, int k) 817adjustheap (WT *heap, int N, int k)
742{ 818{
… …
747/*****************************************************************************/ 823/*****************************************************************************/
748 824
749typedef struct 825typedef struct
750{ 826{
751 WL head; 827 WL head;
752 sig_atomic_t volatile gotsig; 828 EV_ATOMIC_T gotsig;
753} ANSIG; 829} ANSIG;
754 830
755static ANSIG *signals; 831static ANSIG *signals;
756static int signalmax; 832static int signalmax;
757 833
758static int sigpipe [2]; 834static EV_ATOMIC_T gotsig;
759static sig_atomic_t volatile gotsig;
760static ev_io sigev;
761 835
762void inline_size 836void inline_size
763signals_init (ANSIG *base, int count) 837signals_init (ANSIG *base, int count)
764{ 838{
765 while (count--) 839 while (count--)
… …
769 843
770 ++base; 844 ++base;
771 } 845 }
772} 846}
773 847
774static void 848/*****************************************************************************/
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 849
825void inline_speed 850void inline_speed
826fd_intern (int fd) 851fd_intern (int fd)
827{ 852{
828#ifdef _WIN32 853#ifdef _WIN32
… …
833 fcntl (fd, F_SETFL, O_NONBLOCK); 858 fcntl (fd, F_SETFL, O_NONBLOCK);
834#endif 859#endif
835} 860}
836 861
837static void noinline 862static void noinline
838siginit (EV_P) 863evpipe_init (EV_P)
839{ 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
840 fd_intern (sigpipe [0]); 880 fd_intern (evpipe [0]);
841 fd_intern (sigpipe [1]); 881 fd_intern (evpipe [1]);
882 ev_io_set (&pipeev, evpipe [0], EV_READ);
883 }
842 884
843 ev_io_set (&sigev, sigpipe [0], EV_READ);
844 ev_io_start (EV_A_ &sigev); 885 ev_io_start (EV_A_ &pipeev);
845 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
846} 953}
847 954
848/*****************************************************************************/ 955/*****************************************************************************/
849 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
850static WL childs [EV_PID_HASHSIZE]; 994static WL childs [EV_PID_HASHSIZE];
851 995
852#ifndef _WIN32 996#ifndef _WIN32
853 997
854static ev_signal childev; 998static ev_signal childev;
855 999
1000#ifndef WIFCONTINUED
1001# define WIFCONTINUED(status) 0
1002#endif
1003
856void inline_speed 1004void inline_speed
857child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1005child_reap (EV_P_ int chain, int pid, int status)
858{ 1006{
859 ev_child *w; 1007 ev_child *w;
1008 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
860 1009
861 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 {
862 if (w->pid == pid || !w->pid) 1012 if ((w->pid == pid || !w->pid)
1013 && (!traced || (w->flags & 1)))
863 { 1014 {
864 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 */
865 w->rpid = pid; 1016 w->rpid = pid;
866 w->rstatus = status; 1017 w->rstatus = status;
867 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1018 ev_feed_event (EV_A_ (W)w, EV_CHILD);
868 } 1019 }
1020 }
869} 1021}
870 1022
871#ifndef WCONTINUED 1023#ifndef WCONTINUED
872# define WCONTINUED 0 1024# define WCONTINUED 0
873#endif 1025#endif
… …
882 if (!WCONTINUED 1034 if (!WCONTINUED
883 || errno != EINVAL 1035 || errno != EINVAL
884 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1036 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
885 return; 1037 return;
886 1038
887 /* 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 */
888 /* 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 */
889 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1041 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
890 1042
891 child_reap (EV_A_ sw, pid, pid, status); 1043 child_reap (EV_A_ pid, pid, status);
892 if (EV_PID_HASHSIZE > 1) 1044 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 */ 1045 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
894} 1046}
895 1047
896#endif 1048#endif
897 1049
898/*****************************************************************************/ 1050/*****************************************************************************/
… …
970} 1122}
971 1123
972unsigned int 1124unsigned int
973ev_embeddable_backends (void) 1125ev_embeddable_backends (void)
974{ 1126{
1127 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1128
975 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1129 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
976 return EVBACKEND_KQUEUE 1130 /* please fix it and tell me how to detect the fix */
977 | EVBACKEND_PORT; 1131 flags &= ~EVBACKEND_EPOLL;
1132
1133 return flags;
978} 1134}
979 1135
980unsigned int 1136unsigned int
981ev_backend (EV_P) 1137ev_backend (EV_P)
982{ 1138{
… …
1012 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1168 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1013 have_monotonic = 1; 1169 have_monotonic = 1;
1014 } 1170 }
1015#endif 1171#endif
1016 1172
1017 ev_rt_now = ev_time (); 1173 ev_rt_now = ev_time ();
1018 mn_now = get_clock (); 1174 mn_now = get_clock ();
1019 now_floor = mn_now; 1175 now_floor = mn_now;
1020 rtmn_diff = ev_rt_now - mn_now; 1176 rtmn_diff = ev_rt_now - mn_now;
1021 1177
1022 io_blocktime = 0.; 1178 io_blocktime = 0.;
1023 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
1024 1186
1025 /* pid check not overridable via env */ 1187 /* pid check not overridable via env */
1026#ifndef _WIN32 1188#ifndef _WIN32
1027 if (flags & EVFLAG_FORKCHECK) 1189 if (flags & EVFLAG_FORKCHECK)
1028 curpid = getpid (); 1190 curpid = getpid ();
… …
1031 if (!(flags & EVFLAG_NOENV) 1193 if (!(flags & EVFLAG_NOENV)
1032 && !enable_secure () 1194 && !enable_secure ()
1033 && getenv ("LIBEV_FLAGS")) 1195 && getenv ("LIBEV_FLAGS"))
1034 flags = atoi (getenv ("LIBEV_FLAGS")); 1196 flags = atoi (getenv ("LIBEV_FLAGS"));
1035 1197
1036 if (!(flags & 0x0000ffffUL)) 1198 if (!(flags & 0x0000ffffU))
1037 flags |= ev_recommended_backends (); 1199 flags |= ev_recommended_backends ();
1038
1039 backend = 0;
1040 backend_fd = -1;
1041#if EV_USE_INOTIFY
1042 fs_fd = -2;
1043#endif
1044 1200
1045#if EV_USE_PORT 1201#if EV_USE_PORT
1046 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1202 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1047#endif 1203#endif
1048#if EV_USE_KQUEUE 1204#if EV_USE_KQUEUE
… …
1056#endif 1212#endif
1057#if EV_USE_SELECT 1213#if EV_USE_SELECT
1058 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1214 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1059#endif 1215#endif
1060 1216
1061 ev_init (&sigev, sigcb); 1217 ev_init (&pipeev, pipecb);
1062 ev_set_priority (&sigev, EV_MAXPRI); 1218 ev_set_priority (&pipeev, EV_MAXPRI);
1063 } 1219 }
1064} 1220}
1065 1221
1066static void noinline 1222static void noinline
1067loop_destroy (EV_P) 1223loop_destroy (EV_P)
1068{ 1224{
1069 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 }
1070 1243
1071#if EV_USE_INOTIFY 1244#if EV_USE_INOTIFY
1072 if (fs_fd >= 0) 1245 if (fs_fd >= 0)
1073 close (fs_fd); 1246 close (fs_fd);
1074#endif 1247#endif
… …
1111#if EV_FORK_ENABLE 1284#if EV_FORK_ENABLE
1112 array_free (fork, EMPTY); 1285 array_free (fork, EMPTY);
1113#endif 1286#endif
1114 array_free (prepare, EMPTY); 1287 array_free (prepare, EMPTY);
1115 array_free (check, EMPTY); 1288 array_free (check, EMPTY);
1289#if EV_ASYNC_ENABLE
1290 array_free (async, EMPTY);
1291#endif
1116 1292
1117 backend = 0; 1293 backend = 0;
1118} 1294}
1119 1295
1296#if EV_USE_INOTIFY
1120void inline_size infy_fork (EV_P); 1297void inline_size infy_fork (EV_P);
1298#endif
1121 1299
1122void inline_size 1300void inline_size
1123loop_fork (EV_P) 1301loop_fork (EV_P)
1124{ 1302{
1125#if EV_USE_PORT 1303#if EV_USE_PORT
… …
1133#endif 1311#endif
1134#if EV_USE_INOTIFY 1312#if EV_USE_INOTIFY
1135 infy_fork (EV_A); 1313 infy_fork (EV_A);
1136#endif 1314#endif
1137 1315
1138 if (ev_is_active (&sigev)) 1316 if (ev_is_active (&pipeev))
1139 { 1317 {
1140 /* 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
1141 1324
1142 ev_ref (EV_A); 1325 ev_ref (EV_A);
1143 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 {
1144 close (sigpipe [0]); 1335 close (evpipe [0]);
1145 close (sigpipe [1]); 1336 close (evpipe [1]);
1337 }
1146 1338
1147 while (pipe (sigpipe))
1148 syserr ("(libev) error creating pipe");
1149
1150 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);
1151 } 1342 }
1152 1343
1153 postfork = 0; 1344 postfork = 0;
1154} 1345}
1155 1346
… …
1177} 1368}
1178 1369
1179void 1370void
1180ev_loop_fork (EV_P) 1371ev_loop_fork (EV_P)
1181{ 1372{
1182 postfork = 1; 1373 postfork = 1; /* must be in line with ev_default_fork */
1183} 1374}
1184 1375
1185#endif 1376#endif
1186 1377
1187#if EV_MULTIPLICITY 1378#if EV_MULTIPLICITY
… …
1190#else 1381#else
1191int 1382int
1192ev_default_loop (unsigned int flags) 1383ev_default_loop (unsigned int flags)
1193#endif 1384#endif
1194{ 1385{
1195 if (sigpipe [0] == sigpipe [1])
1196 if (pipe (sigpipe))
1197 return 0;
1198
1199 if (!ev_default_loop_ptr) 1386 if (!ev_default_loop_ptr)
1200 { 1387 {
1201#if EV_MULTIPLICITY 1388#if EV_MULTIPLICITY
1202 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1389 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1203#else 1390#else
… …
1206 1393
1207 loop_init (EV_A_ flags); 1394 loop_init (EV_A_ flags);
1208 1395
1209 if (ev_backend (EV_A)) 1396 if (ev_backend (EV_A))
1210 { 1397 {
1211 siginit (EV_A);
1212
1213#ifndef _WIN32 1398#ifndef _WIN32
1214 ev_signal_init (&childev, childcb, SIGCHLD); 1399 ev_signal_init (&childev, childcb, SIGCHLD);
1215 ev_set_priority (&childev, EV_MAXPRI); 1400 ev_set_priority (&childev, EV_MAXPRI);
1216 ev_signal_start (EV_A_ &childev); 1401 ev_signal_start (EV_A_ &childev);
1217 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1402 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1234#ifndef _WIN32 1419#ifndef _WIN32
1235 ev_ref (EV_A); /* child watcher */ 1420 ev_ref (EV_A); /* child watcher */
1236 ev_signal_stop (EV_A_ &childev); 1421 ev_signal_stop (EV_A_ &childev);
1237#endif 1422#endif
1238 1423
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); 1424 loop_destroy (EV_A);
1246} 1425}
1247 1426
1248void 1427void
1249ev_default_fork (void) 1428ev_default_fork (void)
… …
1251#if EV_MULTIPLICITY 1430#if EV_MULTIPLICITY
1252 struct ev_loop *loop = ev_default_loop_ptr; 1431 struct ev_loop *loop = ev_default_loop_ptr;
1253#endif 1432#endif
1254 1433
1255 if (backend) 1434 if (backend)
1256 postfork = 1; 1435 postfork = 1; /* must be in line with ev_loop_fork */
1257} 1436}
1258 1437
1259/*****************************************************************************/ 1438/*****************************************************************************/
1260 1439
1261void 1440void
… …
1285} 1464}
1286 1465
1287void inline_size 1466void inline_size
1288timers_reify (EV_P) 1467timers_reify (EV_P)
1289{ 1468{
1290 while (timercnt && ((WT)timers [0])->at <= mn_now) 1469 while (timercnt && ev_at (timers [1]) <= mn_now)
1291 { 1470 {
1292 ev_timer *w = (ev_timer *)timers [0]; 1471 ev_timer *w = (ev_timer *)timers [1];
1293 1472
1294 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1473 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1295 1474
1296 /* first reschedule or stop timer */ 1475 /* first reschedule or stop timer */
1297 if (w->repeat) 1476 if (w->repeat)
1298 { 1477 {
1299 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.));
1300 1479
1301 ((WT)w)->at += w->repeat; 1480 ev_at (w) += w->repeat;
1302 if (((WT)w)->at < mn_now) 1481 if (ev_at (w) < mn_now)
1303 ((WT)w)->at = mn_now; 1482 ev_at (w) = mn_now;
1304 1483
1305 downheap (timers, timercnt, 0); 1484 downheap (timers, timercnt, 1);
1306 } 1485 }
1307 else 1486 else
1308 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1487 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1309 1488
1310 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1489 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1313 1492
1314#if EV_PERIODIC_ENABLE 1493#if EV_PERIODIC_ENABLE
1315void inline_size 1494void inline_size
1316periodics_reify (EV_P) 1495periodics_reify (EV_P)
1317{ 1496{
1318 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1497 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1319 { 1498 {
1320 ev_periodic *w = (ev_periodic *)periodics [0]; 1499 ev_periodic *w = (ev_periodic *)periodics [1];
1321 1500
1322 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1501 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1323 1502
1324 /* first reschedule or stop timer */ 1503 /* first reschedule or stop timer */
1325 if (w->reschedule_cb) 1504 if (w->reschedule_cb)
1326 { 1505 {
1327 ((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);
1328 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));
1329 downheap (periodics, periodiccnt, 0); 1508 downheap (periodics, periodiccnt, 1);
1330 } 1509 }
1331 else if (w->interval) 1510 else if (w->interval)
1332 { 1511 {
1333 ((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;
1334 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;
1335 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));
1336 downheap (periodics, periodiccnt, 0); 1515 downheap (periodics, periodiccnt, 1);
1337 } 1516 }
1338 else 1517 else
1339 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1518 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1340 1519
1341 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1520 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1346periodics_reschedule (EV_P) 1525periodics_reschedule (EV_P)
1347{ 1526{
1348 int i; 1527 int i;
1349 1528
1350 /* adjust periodics after time jump */ 1529 /* adjust periodics after time jump */
1351 for (i = 0; i < periodiccnt; ++i) 1530 for (i = 1; i <= periodiccnt; ++i)
1352 { 1531 {
1353 ev_periodic *w = (ev_periodic *)periodics [i]; 1532 ev_periodic *w = (ev_periodic *)periodics [i];
1354 1533
1355 if (w->reschedule_cb) 1534 if (w->reschedule_cb)
1356 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1535 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1357 else if (w->interval) 1536 else if (w->interval)
1358 ((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;
1359 } 1538 }
1360 1539
1361 /* now rebuild the heap */ 1540 /* now rebuild the heap */
1362 for (i = periodiccnt >> 1; i--; ) 1541 for (i = periodiccnt >> 1; i--; )
1363 downheap (periodics, periodiccnt, i); 1542 downheap (periodics, periodiccnt, i);
… …
1445 { 1624 {
1446#if EV_PERIODIC_ENABLE 1625#if EV_PERIODIC_ENABLE
1447 periodics_reschedule (EV_A); 1626 periodics_reschedule (EV_A);
1448#endif 1627#endif
1449 /* 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 */
1450 for (i = 0; i < timercnt; ++i) 1629 for (i = 1; i <= timercnt; ++i)
1451 ((WT)timers [i])->at += ev_rt_now - mn_now; 1630 ev_at (timers [i]) += ev_rt_now - mn_now;
1452 } 1631 }
1453 1632
1454 mn_now = ev_rt_now; 1633 mn_now = ev_rt_now;
1455 } 1634 }
1456} 1635}
… …
1470static int loop_done; 1649static int loop_done;
1471 1650
1472void 1651void
1473ev_loop (EV_P_ int flags) 1652ev_loop (EV_P_ int flags)
1474{ 1653{
1475 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1654 loop_done = EVUNLOOP_CANCEL;
1476 ? EVUNLOOP_ONE
1477 : EVUNLOOP_CANCEL;
1478 1655
1479 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 */
1480 1657
1481 do 1658 do
1482 { 1659 {
… …
1528 1705
1529 waittime = MAX_BLOCKTIME; 1706 waittime = MAX_BLOCKTIME;
1530 1707
1531 if (timercnt) 1708 if (timercnt)
1532 { 1709 {
1533 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1710 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1534 if (waittime > to) waittime = to; 1711 if (waittime > to) waittime = to;
1535 } 1712 }
1536 1713
1537#if EV_PERIODIC_ENABLE 1714#if EV_PERIODIC_ENABLE
1538 if (periodiccnt) 1715 if (periodiccnt)
1539 { 1716 {
1540 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;
1541 if (waittime > to) waittime = to; 1718 if (waittime > to) waittime = to;
1542 } 1719 }
1543#endif 1720#endif
1544 1721
1545 if (expect_false (waittime < timeout_blocktime)) 1722 if (expect_false (waittime < timeout_blocktime))
… …
1578 /* queue check watchers, to be executed first */ 1755 /* queue check watchers, to be executed first */
1579 if (expect_false (checkcnt)) 1756 if (expect_false (checkcnt))
1580 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1757 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1581 1758
1582 call_pending (EV_A); 1759 call_pending (EV_A);
1583
1584 } 1760 }
1585 while (expect_true (activecnt && !loop_done)); 1761 while (expect_true (
1762 activecnt
1763 && !loop_done
1764 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1765 ));
1586 1766
1587 if (loop_done == EVUNLOOP_ONE) 1767 if (loop_done == EVUNLOOP_ONE)
1588 loop_done = EVUNLOOP_CANCEL; 1768 loop_done = EVUNLOOP_CANCEL;
1589} 1769}
1590 1770
… …
1708ev_timer_start (EV_P_ ev_timer *w) 1888ev_timer_start (EV_P_ ev_timer *w)
1709{ 1889{
1710 if (expect_false (ev_is_active (w))) 1890 if (expect_false (ev_is_active (w)))
1711 return; 1891 return;
1712 1892
1713 ((WT)w)->at += mn_now; 1893 ev_at (w) += mn_now;
1714 1894
1715 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.));
1716 1896
1717 ev_start (EV_A_ (W)w, ++timercnt); 1897 ev_start (EV_A_ (W)w, ++timercnt);
1718 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1898 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1719 timers [timercnt - 1] = (WT)w; 1899 timers [timercnt] = (WT)w;
1720 upheap (timers, timercnt - 1); 1900 upheap (timers, timercnt);
1721 1901
1722 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1902 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1723} 1903}
1724 1904
1725void noinline 1905void noinline
1726ev_timer_stop (EV_P_ ev_timer *w) 1906ev_timer_stop (EV_P_ ev_timer *w)
1727{ 1907{
1728 clear_pending (EV_A_ (W)w); 1908 clear_pending (EV_A_ (W)w);
1729 if (expect_false (!ev_is_active (w))) 1909 if (expect_false (!ev_is_active (w)))
1730 return; 1910 return;
1731 1911
1732 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1733
1734 { 1912 {
1735 int active = ((W)w)->active; 1913 int active = ev_active (w);
1736 1914
1915 assert (("internal timer heap corruption", timers [active] == (WT)w));
1916
1737 if (expect_true (--active < --timercnt)) 1917 if (expect_true (active < timercnt))
1738 { 1918 {
1739 timers [active] = timers [timercnt]; 1919 timers [active] = timers [timercnt];
1740 adjustheap (timers, timercnt, active); 1920 adjustheap (timers, timercnt, active);
1741 } 1921 }
1922
1923 --timercnt;
1742 } 1924 }
1743 1925
1744 ((WT)w)->at -= mn_now; 1926 ev_at (w) -= mn_now;
1745 1927
1746 ev_stop (EV_A_ (W)w); 1928 ev_stop (EV_A_ (W)w);
1747} 1929}
1748 1930
1749void noinline 1931void noinline
… …
1751{ 1933{
1752 if (ev_is_active (w)) 1934 if (ev_is_active (w))
1753 { 1935 {
1754 if (w->repeat) 1936 if (w->repeat)
1755 { 1937 {
1756 ((WT)w)->at = mn_now + w->repeat; 1938 ev_at (w) = mn_now + w->repeat;
1757 adjustheap (timers, timercnt, ((W)w)->active - 1); 1939 adjustheap (timers, timercnt, ev_active (w));
1758 } 1940 }
1759 else 1941 else
1760 ev_timer_stop (EV_A_ w); 1942 ev_timer_stop (EV_A_ w);
1761 } 1943 }
1762 else if (w->repeat) 1944 else if (w->repeat)
1763 { 1945 {
1764 w->at = w->repeat; 1946 ev_at (w) = w->repeat;
1765 ev_timer_start (EV_A_ w); 1947 ev_timer_start (EV_A_ w);
1766 } 1948 }
1767} 1949}
1768 1950
1769#if EV_PERIODIC_ENABLE 1951#if EV_PERIODIC_ENABLE
… …
1772{ 1954{
1773 if (expect_false (ev_is_active (w))) 1955 if (expect_false (ev_is_active (w)))
1774 return; 1956 return;
1775 1957
1776 if (w->reschedule_cb) 1958 if (w->reschedule_cb)
1777 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1959 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1778 else if (w->interval) 1960 else if (w->interval)
1779 { 1961 {
1780 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.));
1781 /* 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 */
1782 ((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;
1783 } 1965 }
1784 else 1966 else
1785 ((WT)w)->at = w->offset; 1967 ev_at (w) = w->offset;
1786 1968
1787 ev_start (EV_A_ (W)w, ++periodiccnt); 1969 ev_start (EV_A_ (W)w, ++periodiccnt);
1788 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 1970 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1789 periodics [periodiccnt - 1] = (WT)w; 1971 periodics [periodiccnt] = (WT)w;
1790 upheap (periodics, periodiccnt - 1); 1972 upheap (periodics, periodiccnt);
1791 1973
1792 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1974 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1793} 1975}
1794 1976
1795void noinline 1977void noinline
1796ev_periodic_stop (EV_P_ ev_periodic *w) 1978ev_periodic_stop (EV_P_ ev_periodic *w)
1797{ 1979{
1798 clear_pending (EV_A_ (W)w); 1980 clear_pending (EV_A_ (W)w);
1799 if (expect_false (!ev_is_active (w))) 1981 if (expect_false (!ev_is_active (w)))
1800 return; 1982 return;
1801 1983
1802 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1803
1804 { 1984 {
1805 int active = ((W)w)->active; 1985 int active = ev_active (w);
1806 1986
1987 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
1988
1807 if (expect_true (--active < --periodiccnt)) 1989 if (expect_true (active < periodiccnt))
1808 { 1990 {
1809 periodics [active] = periodics [periodiccnt]; 1991 periodics [active] = periodics [periodiccnt];
1810 adjustheap (periodics, periodiccnt, active); 1992 adjustheap (periodics, periodiccnt, active);
1811 } 1993 }
1994
1995 --periodiccnt;
1812 } 1996 }
1813 1997
1814 ev_stop (EV_A_ (W)w); 1998 ev_stop (EV_A_ (W)w);
1815} 1999}
1816 2000
… …
1835#endif 2019#endif
1836 if (expect_false (ev_is_active (w))) 2020 if (expect_false (ev_is_active (w)))
1837 return; 2021 return;
1838 2022
1839 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);
1840 2026
1841 { 2027 {
1842#ifndef _WIN32 2028#ifndef _WIN32
1843 sigset_t full, prev; 2029 sigset_t full, prev;
1844 sigfillset (&full); 2030 sigfillset (&full);
… …
1856 wlist_add (&signals [w->signum - 1].head, (WL)w); 2042 wlist_add (&signals [w->signum - 1].head, (WL)w);
1857 2043
1858 if (!((WL)w)->next) 2044 if (!((WL)w)->next)
1859 { 2045 {
1860#if _WIN32 2046#if _WIN32
1861 signal (w->signum, sighandler); 2047 signal (w->signum, ev_sighandler);
1862#else 2048#else
1863 struct sigaction sa; 2049 struct sigaction sa;
1864 sa.sa_handler = sighandler; 2050 sa.sa_handler = ev_sighandler;
1865 sigfillset (&sa.sa_mask); 2051 sigfillset (&sa.sa_mask);
1866 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 */
1867 sigaction (w->signum, &sa, 0); 2053 sigaction (w->signum, &sa, 0);
1868#endif 2054#endif
1869 } 2055 }
… …
1930 if (w->wd < 0) 2116 if (w->wd < 0)
1931 { 2117 {
1932 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2118 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1933 2119
1934 /* monitor some parent directory for speedup hints */ 2120 /* monitor some parent directory for speedup hints */
2121 /* note that exceeding the hardcoded limit is not a correctness issue, */
2122 /* but an efficiency issue only */
1935 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2123 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1936 { 2124 {
1937 char path [4096]; 2125 char path [4096];
1938 strcpy (path, w->path); 2126 strcpy (path, w->path);
1939 2127
… …
2184 clear_pending (EV_A_ (W)w); 2372 clear_pending (EV_A_ (W)w);
2185 if (expect_false (!ev_is_active (w))) 2373 if (expect_false (!ev_is_active (w)))
2186 return; 2374 return;
2187 2375
2188 { 2376 {
2189 int active = ((W)w)->active; 2377 int active = ev_active (w);
2190 2378
2191 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2379 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2192 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2380 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2193 2381
2194 ev_stop (EV_A_ (W)w); 2382 ev_stop (EV_A_ (W)w);
2195 --idleall; 2383 --idleall;
2196 } 2384 }
2197} 2385}
… …
2214 clear_pending (EV_A_ (W)w); 2402 clear_pending (EV_A_ (W)w);
2215 if (expect_false (!ev_is_active (w))) 2403 if (expect_false (!ev_is_active (w)))
2216 return; 2404 return;
2217 2405
2218 { 2406 {
2219 int active = ((W)w)->active; 2407 int active = ev_active (w);
2408
2220 prepares [active - 1] = prepares [--preparecnt]; 2409 prepares [active - 1] = prepares [--preparecnt];
2221 ((W)prepares [active - 1])->active = active; 2410 ev_active (prepares [active - 1]) = active;
2222 } 2411 }
2223 2412
2224 ev_stop (EV_A_ (W)w); 2413 ev_stop (EV_A_ (W)w);
2225} 2414}
2226 2415
… …
2241 clear_pending (EV_A_ (W)w); 2430 clear_pending (EV_A_ (W)w);
2242 if (expect_false (!ev_is_active (w))) 2431 if (expect_false (!ev_is_active (w)))
2243 return; 2432 return;
2244 2433
2245 { 2434 {
2246 int active = ((W)w)->active; 2435 int active = ev_active (w);
2436
2247 checks [active - 1] = checks [--checkcnt]; 2437 checks [active - 1] = checks [--checkcnt];
2248 ((W)checks [active - 1])->active = active; 2438 ev_active (checks [active - 1]) = active;
2249 } 2439 }
2250 2440
2251 ev_stop (EV_A_ (W)w); 2441 ev_stop (EV_A_ (W)w);
2252} 2442}
2253 2443
… …
2264 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2454 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2265 2455
2266 if (ev_cb (w)) 2456 if (ev_cb (w))
2267 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2457 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2268 else 2458 else
2269 ev_embed_sweep (loop, w); 2459 ev_loop (w->other, EVLOOP_NONBLOCK);
2270} 2460}
2271 2461
2272static void 2462static void
2273embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 2463embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2274{ 2464{
2275 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 2465 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2276 2466
2277 fd_reify (w->other); 2467 {
2468 struct ev_loop *loop = w->other;
2469
2470 while (fdchangecnt)
2471 {
2472 fd_reify (EV_A);
2473 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2474 }
2475 }
2278} 2476}
2477
2478#if 0
2479static void
2480embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2481{
2482 ev_idle_stop (EV_A_ idle);
2483}
2484#endif
2279 2485
2280void 2486void
2281ev_embed_start (EV_P_ ev_embed *w) 2487ev_embed_start (EV_P_ ev_embed *w)
2282{ 2488{
2283 if (expect_false (ev_is_active (w))) 2489 if (expect_false (ev_is_active (w)))
… …
2294 2500
2295 ev_prepare_init (&w->prepare, embed_prepare_cb); 2501 ev_prepare_init (&w->prepare, embed_prepare_cb);
2296 ev_set_priority (&w->prepare, EV_MINPRI); 2502 ev_set_priority (&w->prepare, EV_MINPRI);
2297 ev_prepare_start (EV_A_ &w->prepare); 2503 ev_prepare_start (EV_A_ &w->prepare);
2298 2504
2505 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2506
2299 ev_start (EV_A_ (W)w, 1); 2507 ev_start (EV_A_ (W)w, 1);
2300} 2508}
2301 2509
2302void 2510void
2303ev_embed_stop (EV_P_ ev_embed *w) 2511ev_embed_stop (EV_P_ ev_embed *w)
… …
2331 clear_pending (EV_A_ (W)w); 2539 clear_pending (EV_A_ (W)w);
2332 if (expect_false (!ev_is_active (w))) 2540 if (expect_false (!ev_is_active (w)))
2333 return; 2541 return;
2334 2542
2335 { 2543 {
2336 int active = ((W)w)->active; 2544 int active = ev_active (w);
2545
2337 forks [active - 1] = forks [--forkcnt]; 2546 forks [active - 1] = forks [--forkcnt];
2338 ((W)forks [active - 1])->active = active; 2547 ev_active (forks [active - 1]) = active;
2339 } 2548 }
2340 2549
2341 ev_stop (EV_A_ (W)w); 2550 ev_stop (EV_A_ (W)w);
2551}
2552#endif
2553
2554#if EV_ASYNC_ENABLE
2555void
2556ev_async_start (EV_P_ ev_async *w)
2557{
2558 if (expect_false (ev_is_active (w)))
2559 return;
2560
2561 evpipe_init (EV_A);
2562
2563 ev_start (EV_A_ (W)w, ++asynccnt);
2564 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2565 asyncs [asynccnt - 1] = w;
2566}
2567
2568void
2569ev_async_stop (EV_P_ ev_async *w)
2570{
2571 clear_pending (EV_A_ (W)w);
2572 if (expect_false (!ev_is_active (w)))
2573 return;
2574
2575 {
2576 int active = ev_active (w);
2577
2578 asyncs [active - 1] = asyncs [--asynccnt];
2579 ev_active (asyncs [active - 1]) = active;
2580 }
2581
2582 ev_stop (EV_A_ (W)w);
2583}
2584
2585void
2586ev_async_send (EV_P_ ev_async *w)
2587{
2588 w->sent = 1;
2589 evpipe_write (EV_A_ &gotasync);
2342} 2590}
2343#endif 2591#endif
2344 2592
2345/*****************************************************************************/ 2593/*****************************************************************************/
2346 2594

Diff Legend

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