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

Comparing libev/ev.c (file contents):
Revision 1.198 by root, Sun Dec 23 04:45:51 2007 UTC vs.
Revision 1.227 by root, Fri May 2 07:20:01 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)
… …
283typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
284 329
285#if EV_USE_MONOTONIC 330#if EV_USE_MONOTONIC
286/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 331/* sig_atomic_t is used to avoid per-thread variables or locking but still */
287/* giving it a reasonably high chance of working on typical architetcures */ 332/* giving it a reasonably high chance of working on typical architetcures */
288static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 333static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
289#endif 334#endif
290 335
291#ifdef _WIN32 336#ifdef _WIN32
292# include "ev_win32.c" 337# include "ev_win32.c"
293#endif 338#endif
… …
315 perror (msg); 360 perror (msg);
316 abort (); 361 abort ();
317 } 362 }
318} 363}
319 364
365static void *
366ev_realloc_emul (void *ptr, long size)
367{
368 /* some systems, notably openbsd and darwin, fail to properly
369 * implement realloc (x, 0) (as required by both ansi c-98 and
370 * the single unix specification, so work around them here.
371 */
372
373 if (size)
374 return realloc (ptr, size);
375
376 free (ptr);
377 return 0;
378}
379
320static void *(*alloc)(void *ptr, long size); 380static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
321 381
322void 382void
323ev_set_allocator (void *(*cb)(void *ptr, long size)) 383ev_set_allocator (void *(*cb)(void *ptr, long size))
324{ 384{
325 alloc = cb; 385 alloc = cb;
326} 386}
327 387
328inline_speed void * 388inline_speed void *
329ev_realloc (void *ptr, long size) 389ev_realloc (void *ptr, long size)
330{ 390{
331 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 391 ptr = alloc (ptr, size);
332 392
333 if (!ptr && size) 393 if (!ptr && size)
334 { 394 {
335 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 395 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
336 abort (); 396 abort ();
… …
443 ts.tv_sec = (time_t)delay; 503 ts.tv_sec = (time_t)delay;
444 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 504 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
445 505
446 nanosleep (&ts, 0); 506 nanosleep (&ts, 0);
447#elif defined(_WIN32) 507#elif defined(_WIN32)
448 Sleep (delay * 1e3); 508 Sleep ((unsigned long)(delay * 1e3));
449#else 509#else
450 struct timeval tv; 510 struct timeval tv;
451 511
452 tv.tv_sec = (time_t)delay; 512 tv.tv_sec = (time_t)delay;
453 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 513 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
592 652
593#if EV_SELECT_IS_WINSOCKET 653#if EV_SELECT_IS_WINSOCKET
594 if (events) 654 if (events)
595 { 655 {
596 unsigned long argp; 656 unsigned long argp;
657 #ifdef EV_FD_TO_WIN32_HANDLE
658 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
659 #else
597 anfd->handle = _get_osfhandle (fd); 660 anfd->handle = _get_osfhandle (fd);
661 #endif
598 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 662 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
599 } 663 }
600#endif 664#endif
601 665
602 { 666 {
… …
690 } 754 }
691} 755}
692 756
693/*****************************************************************************/ 757/*****************************************************************************/
694 758
759/* towards the root */
695void inline_speed 760void inline_speed
696upheap (WT *heap, int k) 761upheap (WT *heap, int k)
697{ 762{
698 WT w = heap [k]; 763 WT w = heap [k];
699 764
… …
711 776
712 heap [k] = w; 777 heap [k] = w;
713 ((W)heap [k])->active = k + 1; 778 ((W)heap [k])->active = k + 1;
714} 779}
715 780
781/* away from the root */
716void inline_speed 782void inline_speed
717downheap (WT *heap, int N, int k) 783downheap (WT *heap, int N, int k)
718{ 784{
719 WT w = heap [k]; 785 WT w = heap [k];
720 786
… …
751/*****************************************************************************/ 817/*****************************************************************************/
752 818
753typedef struct 819typedef struct
754{ 820{
755 WL head; 821 WL head;
756 sig_atomic_t volatile gotsig; 822 EV_ATOMIC_T gotsig;
757} ANSIG; 823} ANSIG;
758 824
759static ANSIG *signals; 825static ANSIG *signals;
760static int signalmax; 826static int signalmax;
761 827
762static int sigpipe [2]; 828static EV_ATOMIC_T gotsig;
763static sig_atomic_t volatile gotsig;
764static ev_io sigev;
765 829
766void inline_size 830void inline_size
767signals_init (ANSIG *base, int count) 831signals_init (ANSIG *base, int count)
768{ 832{
769 while (count--) 833 while (count--)
… …
773 837
774 ++base; 838 ++base;
775 } 839 }
776} 840}
777 841
778static void 842/*****************************************************************************/
779sighandler (int signum)
780{
781#if _WIN32
782 signal (signum, sighandler);
783#endif
784
785 signals [signum - 1].gotsig = 1;
786
787 if (!gotsig)
788 {
789 int old_errno = errno;
790 gotsig = 1;
791 write (sigpipe [1], &signum, 1);
792 errno = old_errno;
793 }
794}
795
796void noinline
797ev_feed_signal_event (EV_P_ int signum)
798{
799 WL w;
800
801#if EV_MULTIPLICITY
802 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
803#endif
804
805 --signum;
806
807 if (signum < 0 || signum >= signalmax)
808 return;
809
810 signals [signum].gotsig = 0;
811
812 for (w = signals [signum].head; w; w = w->next)
813 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
814}
815
816static void
817sigcb (EV_P_ ev_io *iow, int revents)
818{
819 int signum;
820
821 read (sigpipe [0], &revents, 1);
822 gotsig = 0;
823
824 for (signum = signalmax; signum--; )
825 if (signals [signum].gotsig)
826 ev_feed_signal_event (EV_A_ signum + 1);
827}
828 843
829void inline_speed 844void inline_speed
830fd_intern (int fd) 845fd_intern (int fd)
831{ 846{
832#ifdef _WIN32 847#ifdef _WIN32
… …
837 fcntl (fd, F_SETFL, O_NONBLOCK); 852 fcntl (fd, F_SETFL, O_NONBLOCK);
838#endif 853#endif
839} 854}
840 855
841static void noinline 856static void noinline
842siginit (EV_P) 857evpipe_init (EV_P)
843{ 858{
859 if (!ev_is_active (&pipeev))
860 {
861#if EV_USE_EVENTFD
862 if ((evfd = eventfd (0, 0)) >= 0)
863 {
864 evpipe [0] = -1;
865 fd_intern (evfd);
866 ev_io_set (&pipeev, evfd, EV_READ);
867 }
868 else
869#endif
870 {
871 while (pipe (evpipe))
872 syserr ("(libev) error creating signal/async pipe");
873
844 fd_intern (sigpipe [0]); 874 fd_intern (evpipe [0]);
845 fd_intern (sigpipe [1]); 875 fd_intern (evpipe [1]);
876 ev_io_set (&pipeev, evpipe [0], EV_READ);
877 }
846 878
847 ev_io_set (&sigev, sigpipe [0], EV_READ);
848 ev_io_start (EV_A_ &sigev); 879 ev_io_start (EV_A_ &pipeev);
849 ev_unref (EV_A); /* child watcher should not keep loop alive */ 880 ev_unref (EV_A); /* watcher should not keep loop alive */
881 }
882}
883
884void inline_size
885evpipe_write (EV_P_ EV_ATOMIC_T *flag)
886{
887 if (!*flag)
888 {
889 int old_errno = errno; /* save errno because write might clobber it */
890
891 *flag = 1;
892
893#if EV_USE_EVENTFD
894 if (evfd >= 0)
895 {
896 uint64_t counter = 1;
897 write (evfd, &counter, sizeof (uint64_t));
898 }
899 else
900#endif
901 write (evpipe [1], &old_errno, 1);
902
903 errno = old_errno;
904 }
905}
906
907static void
908pipecb (EV_P_ ev_io *iow, int revents)
909{
910#if EV_USE_EVENTFD
911 if (evfd >= 0)
912 {
913 uint64_t counter = 1;
914 read (evfd, &counter, sizeof (uint64_t));
915 }
916 else
917#endif
918 {
919 char dummy;
920 read (evpipe [0], &dummy, 1);
921 }
922
923 if (gotsig && ev_is_default_loop (EV_A))
924 {
925 int signum;
926 gotsig = 0;
927
928 for (signum = signalmax; signum--; )
929 if (signals [signum].gotsig)
930 ev_feed_signal_event (EV_A_ signum + 1);
931 }
932
933#if EV_ASYNC_ENABLE
934 if (gotasync)
935 {
936 int i;
937 gotasync = 0;
938
939 for (i = asynccnt; i--; )
940 if (asyncs [i]->sent)
941 {
942 asyncs [i]->sent = 0;
943 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
944 }
945 }
946#endif
850} 947}
851 948
852/*****************************************************************************/ 949/*****************************************************************************/
853 950
951static void
952ev_sighandler (int signum)
953{
954#if EV_MULTIPLICITY
955 struct ev_loop *loop = &default_loop_struct;
956#endif
957
958#if _WIN32
959 signal (signum, ev_sighandler);
960#endif
961
962 signals [signum - 1].gotsig = 1;
963 evpipe_write (EV_A_ &gotsig);
964}
965
966void noinline
967ev_feed_signal_event (EV_P_ int signum)
968{
969 WL w;
970
971#if EV_MULTIPLICITY
972 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
973#endif
974
975 --signum;
976
977 if (signum < 0 || signum >= signalmax)
978 return;
979
980 signals [signum].gotsig = 0;
981
982 for (w = signals [signum].head; w; w = w->next)
983 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
984}
985
986/*****************************************************************************/
987
854static WL childs [EV_PID_HASHSIZE]; 988static WL childs [EV_PID_HASHSIZE];
855 989
856#ifndef _WIN32 990#ifndef _WIN32
857 991
858static ev_signal childev; 992static ev_signal childev;
859 993
994#ifndef WIFCONTINUED
995# define WIFCONTINUED(status) 0
996#endif
997
860void inline_speed 998void inline_speed
861child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 999child_reap (EV_P_ int chain, int pid, int status)
862{ 1000{
863 ev_child *w; 1001 ev_child *w;
1002 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
864 1003
865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1004 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1005 {
866 if (w->pid == pid || !w->pid) 1006 if ((w->pid == pid || !w->pid)
1007 && (!traced || (w->flags & 1)))
867 { 1008 {
868 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1009 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
869 w->rpid = pid; 1010 w->rpid = pid;
870 w->rstatus = status; 1011 w->rstatus = status;
871 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1012 ev_feed_event (EV_A_ (W)w, EV_CHILD);
872 } 1013 }
1014 }
873} 1015}
874 1016
875#ifndef WCONTINUED 1017#ifndef WCONTINUED
876# define WCONTINUED 0 1018# define WCONTINUED 0
877#endif 1019#endif
… …
886 if (!WCONTINUED 1028 if (!WCONTINUED
887 || errno != EINVAL 1029 || errno != EINVAL
888 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1030 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
889 return; 1031 return;
890 1032
891 /* make sure we are called again until all childs have been reaped */ 1033 /* make sure we are called again until all children have been reaped */
892 /* we need to do it this way so that the callback gets called before we continue */ 1034 /* we need to do it this way so that the callback gets called before we continue */
893 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1035 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
894 1036
895 child_reap (EV_A_ sw, pid, pid, status); 1037 child_reap (EV_A_ pid, pid, status);
896 if (EV_PID_HASHSIZE > 1) 1038 if (EV_PID_HASHSIZE > 1)
897 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1039 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
898} 1040}
899 1041
900#endif 1042#endif
901 1043
902/*****************************************************************************/ 1044/*****************************************************************************/
… …
1020 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1162 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1021 have_monotonic = 1; 1163 have_monotonic = 1;
1022 } 1164 }
1023#endif 1165#endif
1024 1166
1025 ev_rt_now = ev_time (); 1167 ev_rt_now = ev_time ();
1026 mn_now = get_clock (); 1168 mn_now = get_clock ();
1027 now_floor = mn_now; 1169 now_floor = mn_now;
1028 rtmn_diff = ev_rt_now - mn_now; 1170 rtmn_diff = ev_rt_now - mn_now;
1029 1171
1030 io_blocktime = 0.; 1172 io_blocktime = 0.;
1031 timeout_blocktime = 0.; 1173 timeout_blocktime = 0.;
1174 backend = 0;
1175 backend_fd = -1;
1176 gotasync = 0;
1177#if EV_USE_INOTIFY
1178 fs_fd = -2;
1179#endif
1032 1180
1033 /* pid check not overridable via env */ 1181 /* pid check not overridable via env */
1034#ifndef _WIN32 1182#ifndef _WIN32
1035 if (flags & EVFLAG_FORKCHECK) 1183 if (flags & EVFLAG_FORKCHECK)
1036 curpid = getpid (); 1184 curpid = getpid ();
… …
1039 if (!(flags & EVFLAG_NOENV) 1187 if (!(flags & EVFLAG_NOENV)
1040 && !enable_secure () 1188 && !enable_secure ()
1041 && getenv ("LIBEV_FLAGS")) 1189 && getenv ("LIBEV_FLAGS"))
1042 flags = atoi (getenv ("LIBEV_FLAGS")); 1190 flags = atoi (getenv ("LIBEV_FLAGS"));
1043 1191
1044 if (!(flags & 0x0000ffffUL)) 1192 if (!(flags & 0x0000ffffU))
1045 flags |= ev_recommended_backends (); 1193 flags |= ev_recommended_backends ();
1046
1047 backend = 0;
1048 backend_fd = -1;
1049#if EV_USE_INOTIFY
1050 fs_fd = -2;
1051#endif
1052 1194
1053#if EV_USE_PORT 1195#if EV_USE_PORT
1054 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1196 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1055#endif 1197#endif
1056#if EV_USE_KQUEUE 1198#if EV_USE_KQUEUE
… …
1064#endif 1206#endif
1065#if EV_USE_SELECT 1207#if EV_USE_SELECT
1066 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1208 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1067#endif 1209#endif
1068 1210
1069 ev_init (&sigev, sigcb); 1211 ev_init (&pipeev, pipecb);
1070 ev_set_priority (&sigev, EV_MAXPRI); 1212 ev_set_priority (&pipeev, EV_MAXPRI);
1071 } 1213 }
1072} 1214}
1073 1215
1074static void noinline 1216static void noinline
1075loop_destroy (EV_P) 1217loop_destroy (EV_P)
1076{ 1218{
1077 int i; 1219 int i;
1220
1221 if (ev_is_active (&pipeev))
1222 {
1223 ev_ref (EV_A); /* signal watcher */
1224 ev_io_stop (EV_A_ &pipeev);
1225
1226#if EV_USE_EVENTFD
1227 if (evfd >= 0)
1228 close (evfd);
1229#endif
1230
1231 if (evpipe [0] >= 0)
1232 {
1233 close (evpipe [0]);
1234 close (evpipe [1]);
1235 }
1236 }
1078 1237
1079#if EV_USE_INOTIFY 1238#if EV_USE_INOTIFY
1080 if (fs_fd >= 0) 1239 if (fs_fd >= 0)
1081 close (fs_fd); 1240 close (fs_fd);
1082#endif 1241#endif
… …
1119#if EV_FORK_ENABLE 1278#if EV_FORK_ENABLE
1120 array_free (fork, EMPTY); 1279 array_free (fork, EMPTY);
1121#endif 1280#endif
1122 array_free (prepare, EMPTY); 1281 array_free (prepare, EMPTY);
1123 array_free (check, EMPTY); 1282 array_free (check, EMPTY);
1283#if EV_ASYNC_ENABLE
1284 array_free (async, EMPTY);
1285#endif
1124 1286
1125 backend = 0; 1287 backend = 0;
1126} 1288}
1127 1289
1290#if EV_USE_INOTIFY
1128void inline_size infy_fork (EV_P); 1291void inline_size infy_fork (EV_P);
1292#endif
1129 1293
1130void inline_size 1294void inline_size
1131loop_fork (EV_P) 1295loop_fork (EV_P)
1132{ 1296{
1133#if EV_USE_PORT 1297#if EV_USE_PORT
… …
1141#endif 1305#endif
1142#if EV_USE_INOTIFY 1306#if EV_USE_INOTIFY
1143 infy_fork (EV_A); 1307 infy_fork (EV_A);
1144#endif 1308#endif
1145 1309
1146 if (ev_is_active (&sigev)) 1310 if (ev_is_active (&pipeev))
1147 { 1311 {
1148 /* default loop */ 1312 /* this "locks" the handlers against writing to the pipe */
1313 /* while we modify the fd vars */
1314 gotsig = 1;
1315#if EV_ASYNC_ENABLE
1316 gotasync = 1;
1317#endif
1149 1318
1150 ev_ref (EV_A); 1319 ev_ref (EV_A);
1151 ev_io_stop (EV_A_ &sigev); 1320 ev_io_stop (EV_A_ &pipeev);
1321
1322#if EV_USE_EVENTFD
1323 if (evfd >= 0)
1324 close (evfd);
1325#endif
1326
1327 if (evpipe [0] >= 0)
1328 {
1152 close (sigpipe [0]); 1329 close (evpipe [0]);
1153 close (sigpipe [1]); 1330 close (evpipe [1]);
1331 }
1154 1332
1155 while (pipe (sigpipe))
1156 syserr ("(libev) error creating pipe");
1157
1158 siginit (EV_A); 1333 evpipe_init (EV_A);
1334 /* now iterate over everything, in case we missed something */
1335 pipecb (EV_A_ &pipeev, EV_READ);
1159 } 1336 }
1160 1337
1161 postfork = 0; 1338 postfork = 0;
1162} 1339}
1163 1340
… …
1185} 1362}
1186 1363
1187void 1364void
1188ev_loop_fork (EV_P) 1365ev_loop_fork (EV_P)
1189{ 1366{
1190 postfork = 1; 1367 postfork = 1; /* must be in line with ev_default_fork */
1191} 1368}
1192 1369
1193#endif 1370#endif
1194 1371
1195#if EV_MULTIPLICITY 1372#if EV_MULTIPLICITY
… …
1198#else 1375#else
1199int 1376int
1200ev_default_loop (unsigned int flags) 1377ev_default_loop (unsigned int flags)
1201#endif 1378#endif
1202{ 1379{
1203 if (sigpipe [0] == sigpipe [1])
1204 if (pipe (sigpipe))
1205 return 0;
1206
1207 if (!ev_default_loop_ptr) 1380 if (!ev_default_loop_ptr)
1208 { 1381 {
1209#if EV_MULTIPLICITY 1382#if EV_MULTIPLICITY
1210 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1383 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1211#else 1384#else
… …
1214 1387
1215 loop_init (EV_A_ flags); 1388 loop_init (EV_A_ flags);
1216 1389
1217 if (ev_backend (EV_A)) 1390 if (ev_backend (EV_A))
1218 { 1391 {
1219 siginit (EV_A);
1220
1221#ifndef _WIN32 1392#ifndef _WIN32
1222 ev_signal_init (&childev, childcb, SIGCHLD); 1393 ev_signal_init (&childev, childcb, SIGCHLD);
1223 ev_set_priority (&childev, EV_MAXPRI); 1394 ev_set_priority (&childev, EV_MAXPRI);
1224 ev_signal_start (EV_A_ &childev); 1395 ev_signal_start (EV_A_ &childev);
1225 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1396 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1242#ifndef _WIN32 1413#ifndef _WIN32
1243 ev_ref (EV_A); /* child watcher */ 1414 ev_ref (EV_A); /* child watcher */
1244 ev_signal_stop (EV_A_ &childev); 1415 ev_signal_stop (EV_A_ &childev);
1245#endif 1416#endif
1246 1417
1247 ev_ref (EV_A); /* signal watcher */
1248 ev_io_stop (EV_A_ &sigev);
1249
1250 close (sigpipe [0]); sigpipe [0] = 0;
1251 close (sigpipe [1]); sigpipe [1] = 0;
1252
1253 loop_destroy (EV_A); 1418 loop_destroy (EV_A);
1254} 1419}
1255 1420
1256void 1421void
1257ev_default_fork (void) 1422ev_default_fork (void)
… …
1259#if EV_MULTIPLICITY 1424#if EV_MULTIPLICITY
1260 struct ev_loop *loop = ev_default_loop_ptr; 1425 struct ev_loop *loop = ev_default_loop_ptr;
1261#endif 1426#endif
1262 1427
1263 if (backend) 1428 if (backend)
1264 postfork = 1; 1429 postfork = 1; /* must be in line with ev_loop_fork */
1265} 1430}
1266 1431
1267/*****************************************************************************/ 1432/*****************************************************************************/
1268 1433
1269void 1434void
… …
1478static int loop_done; 1643static int loop_done;
1479 1644
1480void 1645void
1481ev_loop (EV_P_ int flags) 1646ev_loop (EV_P_ int flags)
1482{ 1647{
1483 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1648 loop_done = EVUNLOOP_CANCEL;
1484 ? EVUNLOOP_ONE
1485 : EVUNLOOP_CANCEL;
1486 1649
1487 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1650 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1488 1651
1489 do 1652 do
1490 { 1653 {
… …
1586 /* queue check watchers, to be executed first */ 1749 /* queue check watchers, to be executed first */
1587 if (expect_false (checkcnt)) 1750 if (expect_false (checkcnt))
1588 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1751 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1589 1752
1590 call_pending (EV_A); 1753 call_pending (EV_A);
1591
1592 } 1754 }
1593 while (expect_true (activecnt && !loop_done)); 1755 while (expect_true (
1756 activecnt
1757 && !loop_done
1758 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1759 ));
1594 1760
1595 if (loop_done == EVUNLOOP_ONE) 1761 if (loop_done == EVUNLOOP_ONE)
1596 loop_done = EVUNLOOP_CANCEL; 1762 loop_done = EVUNLOOP_CANCEL;
1597} 1763}
1598 1764
… …
1844 if (expect_false (ev_is_active (w))) 2010 if (expect_false (ev_is_active (w)))
1845 return; 2011 return;
1846 2012
1847 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2013 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1848 2014
2015 evpipe_init (EV_A);
2016
1849 { 2017 {
1850#ifndef _WIN32 2018#ifndef _WIN32
1851 sigset_t full, prev; 2019 sigset_t full, prev;
1852 sigfillset (&full); 2020 sigfillset (&full);
1853 sigprocmask (SIG_SETMASK, &full, &prev); 2021 sigprocmask (SIG_SETMASK, &full, &prev);
… …
1864 wlist_add (&signals [w->signum - 1].head, (WL)w); 2032 wlist_add (&signals [w->signum - 1].head, (WL)w);
1865 2033
1866 if (!((WL)w)->next) 2034 if (!((WL)w)->next)
1867 { 2035 {
1868#if _WIN32 2036#if _WIN32
1869 signal (w->signum, sighandler); 2037 signal (w->signum, ev_sighandler);
1870#else 2038#else
1871 struct sigaction sa; 2039 struct sigaction sa;
1872 sa.sa_handler = sighandler; 2040 sa.sa_handler = ev_sighandler;
1873 sigfillset (&sa.sa_mask); 2041 sigfillset (&sa.sa_mask);
1874 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2042 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1875 sigaction (w->signum, &sa, 0); 2043 sigaction (w->signum, &sa, 0);
1876#endif 2044#endif
1877 } 2045 }
… …
2366 2534
2367 ev_stop (EV_A_ (W)w); 2535 ev_stop (EV_A_ (W)w);
2368} 2536}
2369#endif 2537#endif
2370 2538
2539#if EV_ASYNC_ENABLE
2540void
2541ev_async_start (EV_P_ ev_async *w)
2542{
2543 if (expect_false (ev_is_active (w)))
2544 return;
2545
2546 evpipe_init (EV_A);
2547
2548 ev_start (EV_A_ (W)w, ++asynccnt);
2549 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2550 asyncs [asynccnt - 1] = w;
2551}
2552
2553void
2554ev_async_stop (EV_P_ ev_async *w)
2555{
2556 clear_pending (EV_A_ (W)w);
2557 if (expect_false (!ev_is_active (w)))
2558 return;
2559
2560 {
2561 int active = ((W)w)->active;
2562 asyncs [active - 1] = asyncs [--asynccnt];
2563 ((W)asyncs [active - 1])->active = active;
2564 }
2565
2566 ev_stop (EV_A_ (W)w);
2567}
2568
2569void
2570ev_async_send (EV_P_ ev_async *w)
2571{
2572 w->sent = 1;
2573 evpipe_write (EV_A_ &gotasync);
2574}
2575#endif
2576
2371/*****************************************************************************/ 2577/*****************************************************************************/
2372 2578
2373struct ev_once 2579struct ev_once
2374{ 2580{
2375 ev_io io; 2581 ev_io io;

Diff Legend

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