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

Comparing libev/ev.c (file contents):
Revision 1.195 by root, Sat Dec 22 11:44:51 2007 UTC vs.
Revision 1.224 by root, Wed Apr 9 22:07:50 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#if EV_USE_MONOTONIC
285/* 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 */
286/* giving it a reasonably high chance of working on typical architetcures */ 332/* giving it a reasonably high chance of working on typical architetcures */
287static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 333static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
334#endif
288 335
289#ifdef _WIN32 336#ifdef _WIN32
290# include "ev_win32.c" 337# include "ev_win32.c"
291#endif 338#endif
292 339
… …
313 perror (msg); 360 perror (msg);
314 abort (); 361 abort ();
315 } 362 }
316} 363}
317 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
318static void *(*alloc)(void *ptr, long size); 380static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
319 381
320void 382void
321ev_set_allocator (void *(*cb)(void *ptr, long size)) 383ev_set_allocator (void *(*cb)(void *ptr, long size))
322{ 384{
323 alloc = cb; 385 alloc = cb;
324} 386}
325 387
326inline_speed void * 388inline_speed void *
327ev_realloc (void *ptr, long size) 389ev_realloc (void *ptr, long size)
328{ 390{
329 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 391 ptr = alloc (ptr, size);
330 392
331 if (!ptr && size) 393 if (!ptr && size)
332 { 394 {
333 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 395 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
334 abort (); 396 abort ();
… …
441 ts.tv_sec = (time_t)delay; 503 ts.tv_sec = (time_t)delay;
442 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 504 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
443 505
444 nanosleep (&ts, 0); 506 nanosleep (&ts, 0);
445#elif defined(_WIN32) 507#elif defined(_WIN32)
446 Sleep (delay * 1e3); 508 Sleep ((unsigned long)(delay * 1e3));
447#else 509#else
448 struct timeval tv; 510 struct timeval tv;
449 511
450 tv.tv_sec = (time_t)delay; 512 tv.tv_sec = (time_t)delay;
451 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 513 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
590 652
591#if EV_SELECT_IS_WINSOCKET 653#if EV_SELECT_IS_WINSOCKET
592 if (events) 654 if (events)
593 { 655 {
594 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
595 anfd->handle = _get_osfhandle (fd); 660 anfd->handle = _get_osfhandle (fd);
661 #endif
596 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));
597 } 663 }
598#endif 664#endif
599 665
600 { 666 {
… …
749/*****************************************************************************/ 815/*****************************************************************************/
750 816
751typedef struct 817typedef struct
752{ 818{
753 WL head; 819 WL head;
754 sig_atomic_t volatile gotsig; 820 EV_ATOMIC_T gotsig;
755} ANSIG; 821} ANSIG;
756 822
757static ANSIG *signals; 823static ANSIG *signals;
758static int signalmax; 824static int signalmax;
759 825
760static int sigpipe [2]; 826static EV_ATOMIC_T gotsig;
761static sig_atomic_t volatile gotsig;
762static ev_io sigev;
763 827
764void inline_size 828void inline_size
765signals_init (ANSIG *base, int count) 829signals_init (ANSIG *base, int count)
766{ 830{
767 while (count--) 831 while (count--)
… …
771 835
772 ++base; 836 ++base;
773 } 837 }
774} 838}
775 839
776static void 840/*****************************************************************************/
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 841
827void inline_speed 842void inline_speed
828fd_intern (int fd) 843fd_intern (int fd)
829{ 844{
830#ifdef _WIN32 845#ifdef _WIN32
… …
835 fcntl (fd, F_SETFL, O_NONBLOCK); 850 fcntl (fd, F_SETFL, O_NONBLOCK);
836#endif 851#endif
837} 852}
838 853
839static void noinline 854static void noinline
840siginit (EV_P) 855evpipe_init (EV_P)
841{ 856{
857 if (!ev_is_active (&pipeev))
858 {
859#if EV_USE_EVENTFD
860 if ((evfd = eventfd (0, 0)) >= 0)
861 {
862 evpipe [0] = -1;
863 fd_intern (evfd);
864 ev_io_set (&pipeev, evfd, EV_READ);
865 }
866 else
867#endif
868 {
869 while (pipe (evpipe))
870 syserr ("(libev) error creating signal/async pipe");
871
842 fd_intern (sigpipe [0]); 872 fd_intern (evpipe [0]);
843 fd_intern (sigpipe [1]); 873 fd_intern (evpipe [1]);
874 ev_io_set (&pipeev, evpipe [0], EV_READ);
875 }
844 876
845 ev_io_set (&sigev, sigpipe [0], EV_READ);
846 ev_io_start (EV_A_ &sigev); 877 ev_io_start (EV_A_ &pipeev);
847 ev_unref (EV_A); /* child watcher should not keep loop alive */ 878 ev_unref (EV_A); /* watcher should not keep loop alive */
879 }
880}
881
882void inline_size
883evpipe_write (EV_P_ EV_ATOMIC_T *flag)
884{
885 if (!*flag)
886 {
887 int old_errno = errno; /* save errno because write might clobber it */
888
889 *flag = 1;
890
891#if EV_USE_EVENTFD
892 if (evfd >= 0)
893 {
894 uint64_t counter = 1;
895 write (evfd, &counter, sizeof (uint64_t));
896 }
897 else
898#endif
899 write (evpipe [1], &old_errno, 1);
900
901 errno = old_errno;
902 }
903}
904
905static void
906pipecb (EV_P_ ev_io *iow, int revents)
907{
908#if EV_USE_EVENTFD
909 if (evfd >= 0)
910 {
911 uint64_t counter = 1;
912 read (evfd, &counter, sizeof (uint64_t));
913 }
914 else
915#endif
916 {
917 char dummy;
918 read (evpipe [0], &dummy, 1);
919 }
920
921 if (gotsig && ev_is_default_loop (EV_A))
922 {
923 int signum;
924 gotsig = 0;
925
926 for (signum = signalmax; signum--; )
927 if (signals [signum].gotsig)
928 ev_feed_signal_event (EV_A_ signum + 1);
929 }
930
931#if EV_ASYNC_ENABLE
932 if (gotasync)
933 {
934 int i;
935 gotasync = 0;
936
937 for (i = asynccnt; i--; )
938 if (asyncs [i]->sent)
939 {
940 asyncs [i]->sent = 0;
941 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
942 }
943 }
944#endif
848} 945}
849 946
850/*****************************************************************************/ 947/*****************************************************************************/
851 948
949static void
950ev_sighandler (int signum)
951{
952#if EV_MULTIPLICITY
953 struct ev_loop *loop = &default_loop_struct;
954#endif
955
956#if _WIN32
957 signal (signum, ev_sighandler);
958#endif
959
960 signals [signum - 1].gotsig = 1;
961 evpipe_write (EV_A_ &gotsig);
962}
963
964void noinline
965ev_feed_signal_event (EV_P_ int signum)
966{
967 WL w;
968
969#if EV_MULTIPLICITY
970 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
971#endif
972
973 --signum;
974
975 if (signum < 0 || signum >= signalmax)
976 return;
977
978 signals [signum].gotsig = 0;
979
980 for (w = signals [signum].head; w; w = w->next)
981 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
982}
983
984/*****************************************************************************/
985
852static WL childs [EV_PID_HASHSIZE]; 986static WL childs [EV_PID_HASHSIZE];
853 987
854#ifndef _WIN32 988#ifndef _WIN32
855 989
856static ev_signal childev; 990static ev_signal childev;
857 991
992#ifndef WIFCONTINUED
993# define WIFCONTINUED(status) 0
994#endif
995
858void inline_speed 996void inline_speed
859child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 997child_reap (EV_P_ int chain, int pid, int status)
860{ 998{
861 ev_child *w; 999 ev_child *w;
1000 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
862 1001
863 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1002 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1003 {
864 if (w->pid == pid || !w->pid) 1004 if ((w->pid == pid || !w->pid)
1005 && (!traced || (w->flags & 1)))
865 { 1006 {
866 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1007 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; 1008 w->rpid = pid;
868 w->rstatus = status; 1009 w->rstatus = status;
869 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1010 ev_feed_event (EV_A_ (W)w, EV_CHILD);
870 } 1011 }
1012 }
871} 1013}
872 1014
873#ifndef WCONTINUED 1015#ifndef WCONTINUED
874# define WCONTINUED 0 1016# define WCONTINUED 0
875#endif 1017#endif
… …
884 if (!WCONTINUED 1026 if (!WCONTINUED
885 || errno != EINVAL 1027 || errno != EINVAL
886 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1028 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
887 return; 1029 return;
888 1030
889 /* make sure we are called again until all childs have been reaped */ 1031 /* 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 */ 1032 /* 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); 1033 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
892 1034
893 child_reap (EV_A_ sw, pid, pid, status); 1035 child_reap (EV_A_ pid, pid, status);
894 if (EV_PID_HASHSIZE > 1) 1036 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 */ 1037 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
896} 1038}
897 1039
898#endif 1040#endif
899 1041
900/*****************************************************************************/ 1042/*****************************************************************************/
… …
972} 1114}
973 1115
974unsigned int 1116unsigned int
975ev_embeddable_backends (void) 1117ev_embeddable_backends (void)
976{ 1118{
1119 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1120
977 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1121 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
978 return EVBACKEND_KQUEUE 1122 /* please fix it and tell me how to detect the fix */
979 | EVBACKEND_PORT; 1123 flags &= ~EVBACKEND_EPOLL;
1124
1125 return flags;
980} 1126}
981 1127
982unsigned int 1128unsigned int
983ev_backend (EV_P) 1129ev_backend (EV_P)
984{ 1130{
… …
1014 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1160 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1015 have_monotonic = 1; 1161 have_monotonic = 1;
1016 } 1162 }
1017#endif 1163#endif
1018 1164
1019 ev_rt_now = ev_time (); 1165 ev_rt_now = ev_time ();
1020 mn_now = get_clock (); 1166 mn_now = get_clock ();
1021 now_floor = mn_now; 1167 now_floor = mn_now;
1022 rtmn_diff = ev_rt_now - mn_now; 1168 rtmn_diff = ev_rt_now - mn_now;
1023 1169
1024 io_blocktime = 0.; 1170 io_blocktime = 0.;
1025 timeout_blocktime = 0.; 1171 timeout_blocktime = 0.;
1172 backend = 0;
1173 backend_fd = -1;
1174 gotasync = 0;
1175#if EV_USE_INOTIFY
1176 fs_fd = -2;
1177#endif
1026 1178
1027 /* pid check not overridable via env */ 1179 /* pid check not overridable via env */
1028#ifndef _WIN32 1180#ifndef _WIN32
1029 if (flags & EVFLAG_FORKCHECK) 1181 if (flags & EVFLAG_FORKCHECK)
1030 curpid = getpid (); 1182 curpid = getpid ();
… …
1036 flags = atoi (getenv ("LIBEV_FLAGS")); 1188 flags = atoi (getenv ("LIBEV_FLAGS"));
1037 1189
1038 if (!(flags & 0x0000ffffUL)) 1190 if (!(flags & 0x0000ffffUL))
1039 flags |= ev_recommended_backends (); 1191 flags |= ev_recommended_backends ();
1040 1192
1041 backend = 0;
1042 backend_fd = -1;
1043#if EV_USE_INOTIFY
1044 fs_fd = -2;
1045#endif
1046
1047#if EV_USE_PORT 1193#if EV_USE_PORT
1048 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1194 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1049#endif 1195#endif
1050#if EV_USE_KQUEUE 1196#if EV_USE_KQUEUE
1051 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1197 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1058#endif 1204#endif
1059#if EV_USE_SELECT 1205#if EV_USE_SELECT
1060 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1206 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1061#endif 1207#endif
1062 1208
1063 ev_init (&sigev, sigcb); 1209 ev_init (&pipeev, pipecb);
1064 ev_set_priority (&sigev, EV_MAXPRI); 1210 ev_set_priority (&pipeev, EV_MAXPRI);
1065 } 1211 }
1066} 1212}
1067 1213
1068static void noinline 1214static void noinline
1069loop_destroy (EV_P) 1215loop_destroy (EV_P)
1070{ 1216{
1071 int i; 1217 int i;
1218
1219 if (ev_is_active (&pipeev))
1220 {
1221 ev_ref (EV_A); /* signal watcher */
1222 ev_io_stop (EV_A_ &pipeev);
1223
1224#if EV_USE_EVENTFD
1225 if (evfd >= 0)
1226 close (evfd);
1227#endif
1228
1229 if (evpipe [0] >= 0)
1230 {
1231 close (evpipe [0]);
1232 close (evpipe [1]);
1233 }
1234 }
1072 1235
1073#if EV_USE_INOTIFY 1236#if EV_USE_INOTIFY
1074 if (fs_fd >= 0) 1237 if (fs_fd >= 0)
1075 close (fs_fd); 1238 close (fs_fd);
1076#endif 1239#endif
… …
1113#if EV_FORK_ENABLE 1276#if EV_FORK_ENABLE
1114 array_free (fork, EMPTY); 1277 array_free (fork, EMPTY);
1115#endif 1278#endif
1116 array_free (prepare, EMPTY); 1279 array_free (prepare, EMPTY);
1117 array_free (check, EMPTY); 1280 array_free (check, EMPTY);
1281#if EV_ASYNC_ENABLE
1282 array_free (async, EMPTY);
1283#endif
1118 1284
1119 backend = 0; 1285 backend = 0;
1120} 1286}
1121 1287
1122void inline_size infy_fork (EV_P); 1288void inline_size infy_fork (EV_P);
… …
1135#endif 1301#endif
1136#if EV_USE_INOTIFY 1302#if EV_USE_INOTIFY
1137 infy_fork (EV_A); 1303 infy_fork (EV_A);
1138#endif 1304#endif
1139 1305
1140 if (ev_is_active (&sigev)) 1306 if (ev_is_active (&pipeev))
1141 { 1307 {
1142 /* default loop */ 1308 /* this "locks" the handlers against writing to the pipe */
1309 /* while we modify the fd vars */
1310 gotsig = 1;
1311#if EV_ASYNC_ENABLE
1312 gotasync = 1;
1313#endif
1143 1314
1144 ev_ref (EV_A); 1315 ev_ref (EV_A);
1145 ev_io_stop (EV_A_ &sigev); 1316 ev_io_stop (EV_A_ &pipeev);
1317
1318#if EV_USE_EVENTFD
1319 if (evfd >= 0)
1320 close (evfd);
1321#endif
1322
1323 if (evpipe [0] >= 0)
1324 {
1146 close (sigpipe [0]); 1325 close (evpipe [0]);
1147 close (sigpipe [1]); 1326 close (evpipe [1]);
1327 }
1148 1328
1149 while (pipe (sigpipe))
1150 syserr ("(libev) error creating pipe");
1151
1152 siginit (EV_A); 1329 evpipe_init (EV_A);
1330 /* now iterate over everything, in case we missed something */
1331 pipecb (EV_A_ &pipeev, EV_READ);
1153 } 1332 }
1154 1333
1155 postfork = 0; 1334 postfork = 0;
1156} 1335}
1157 1336
… …
1179} 1358}
1180 1359
1181void 1360void
1182ev_loop_fork (EV_P) 1361ev_loop_fork (EV_P)
1183{ 1362{
1184 postfork = 1; 1363 postfork = 1; /* must be in line with ev_default_fork */
1185} 1364}
1186 1365
1187#endif 1366#endif
1188 1367
1189#if EV_MULTIPLICITY 1368#if EV_MULTIPLICITY
… …
1192#else 1371#else
1193int 1372int
1194ev_default_loop (unsigned int flags) 1373ev_default_loop (unsigned int flags)
1195#endif 1374#endif
1196{ 1375{
1197 if (sigpipe [0] == sigpipe [1])
1198 if (pipe (sigpipe))
1199 return 0;
1200
1201 if (!ev_default_loop_ptr) 1376 if (!ev_default_loop_ptr)
1202 { 1377 {
1203#if EV_MULTIPLICITY 1378#if EV_MULTIPLICITY
1204 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1379 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1205#else 1380#else
… …
1208 1383
1209 loop_init (EV_A_ flags); 1384 loop_init (EV_A_ flags);
1210 1385
1211 if (ev_backend (EV_A)) 1386 if (ev_backend (EV_A))
1212 { 1387 {
1213 siginit (EV_A);
1214
1215#ifndef _WIN32 1388#ifndef _WIN32
1216 ev_signal_init (&childev, childcb, SIGCHLD); 1389 ev_signal_init (&childev, childcb, SIGCHLD);
1217 ev_set_priority (&childev, EV_MAXPRI); 1390 ev_set_priority (&childev, EV_MAXPRI);
1218 ev_signal_start (EV_A_ &childev); 1391 ev_signal_start (EV_A_ &childev);
1219 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1392 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1236#ifndef _WIN32 1409#ifndef _WIN32
1237 ev_ref (EV_A); /* child watcher */ 1410 ev_ref (EV_A); /* child watcher */
1238 ev_signal_stop (EV_A_ &childev); 1411 ev_signal_stop (EV_A_ &childev);
1239#endif 1412#endif
1240 1413
1241 ev_ref (EV_A); /* signal watcher */
1242 ev_io_stop (EV_A_ &sigev);
1243
1244 close (sigpipe [0]); sigpipe [0] = 0;
1245 close (sigpipe [1]); sigpipe [1] = 0;
1246
1247 loop_destroy (EV_A); 1414 loop_destroy (EV_A);
1248} 1415}
1249 1416
1250void 1417void
1251ev_default_fork (void) 1418ev_default_fork (void)
… …
1253#if EV_MULTIPLICITY 1420#if EV_MULTIPLICITY
1254 struct ev_loop *loop = ev_default_loop_ptr; 1421 struct ev_loop *loop = ev_default_loop_ptr;
1255#endif 1422#endif
1256 1423
1257 if (backend) 1424 if (backend)
1258 postfork = 1; 1425 postfork = 1; /* must be in line with ev_loop_fork */
1259} 1426}
1260 1427
1261/*****************************************************************************/ 1428/*****************************************************************************/
1262 1429
1263void 1430void
… …
1472static int loop_done; 1639static int loop_done;
1473 1640
1474void 1641void
1475ev_loop (EV_P_ int flags) 1642ev_loop (EV_P_ int flags)
1476{ 1643{
1477 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1644 loop_done = EVUNLOOP_CANCEL;
1478 ? EVUNLOOP_ONE
1479 : EVUNLOOP_CANCEL;
1480 1645
1481 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1646 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1482 1647
1483 do 1648 do
1484 { 1649 {
… …
1580 /* queue check watchers, to be executed first */ 1745 /* queue check watchers, to be executed first */
1581 if (expect_false (checkcnt)) 1746 if (expect_false (checkcnt))
1582 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1747 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1583 1748
1584 call_pending (EV_A); 1749 call_pending (EV_A);
1585
1586 } 1750 }
1587 while (expect_true (activecnt && !loop_done)); 1751 while (expect_true (
1752 activecnt
1753 && !loop_done
1754 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1755 ));
1588 1756
1589 if (loop_done == EVUNLOOP_ONE) 1757 if (loop_done == EVUNLOOP_ONE)
1590 loop_done = EVUNLOOP_CANCEL; 1758 loop_done = EVUNLOOP_CANCEL;
1591} 1759}
1592 1760
… …
1838 if (expect_false (ev_is_active (w))) 2006 if (expect_false (ev_is_active (w)))
1839 return; 2007 return;
1840 2008
1841 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2009 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1842 2010
2011 evpipe_init (EV_A);
2012
1843 { 2013 {
1844#ifndef _WIN32 2014#ifndef _WIN32
1845 sigset_t full, prev; 2015 sigset_t full, prev;
1846 sigfillset (&full); 2016 sigfillset (&full);
1847 sigprocmask (SIG_SETMASK, &full, &prev); 2017 sigprocmask (SIG_SETMASK, &full, &prev);
… …
1858 wlist_add (&signals [w->signum - 1].head, (WL)w); 2028 wlist_add (&signals [w->signum - 1].head, (WL)w);
1859 2029
1860 if (!((WL)w)->next) 2030 if (!((WL)w)->next)
1861 { 2031 {
1862#if _WIN32 2032#if _WIN32
1863 signal (w->signum, sighandler); 2033 signal (w->signum, ev_sighandler);
1864#else 2034#else
1865 struct sigaction sa; 2035 struct sigaction sa;
1866 sa.sa_handler = sighandler; 2036 sa.sa_handler = ev_sighandler;
1867 sigfillset (&sa.sa_mask); 2037 sigfillset (&sa.sa_mask);
1868 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2038 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1869 sigaction (w->signum, &sa, 0); 2039 sigaction (w->signum, &sa, 0);
1870#endif 2040#endif
1871 } 2041 }
… …
2360 2530
2361 ev_stop (EV_A_ (W)w); 2531 ev_stop (EV_A_ (W)w);
2362} 2532}
2363#endif 2533#endif
2364 2534
2535#if EV_ASYNC_ENABLE
2536void
2537ev_async_start (EV_P_ ev_async *w)
2538{
2539 if (expect_false (ev_is_active (w)))
2540 return;
2541
2542 evpipe_init (EV_A);
2543
2544 ev_start (EV_A_ (W)w, ++asynccnt);
2545 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2546 asyncs [asynccnt - 1] = w;
2547}
2548
2549void
2550ev_async_stop (EV_P_ ev_async *w)
2551{
2552 clear_pending (EV_A_ (W)w);
2553 if (expect_false (!ev_is_active (w)))
2554 return;
2555
2556 {
2557 int active = ((W)w)->active;
2558 asyncs [active - 1] = asyncs [--asynccnt];
2559 ((W)asyncs [active - 1])->active = active;
2560 }
2561
2562 ev_stop (EV_A_ (W)w);
2563}
2564
2565void
2566ev_async_send (EV_P_ ev_async *w)
2567{
2568 w->sent = 1;
2569 evpipe_write (EV_A_ &gotasync);
2570}
2571#endif
2572
2365/*****************************************************************************/ 2573/*****************************************************************************/
2366 2574
2367struct ev_once 2575struct ev_once
2368{ 2576{
2369 ev_io io; 2577 ev_io io;

Diff Legend

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