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

Comparing libev/ev.c (file contents):
Revision 1.197 by root, Sat Dec 22 15:20:13 2007 UTC vs.
Revision 1.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)
… …
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 {
… …
688 } 754 }
689} 755}
690 756
691/*****************************************************************************/ 757/*****************************************************************************/
692 758
759/* towards the root */
693void inline_speed 760void inline_speed
694upheap (WT *heap, int k) 761upheap (WT *heap, int k)
695{ 762{
696 WT w = heap [k]; 763 WT w = heap [k];
697 764
… …
709 776
710 heap [k] = w; 777 heap [k] = w;
711 ((W)heap [k])->active = k + 1; 778 ((W)heap [k])->active = k + 1;
712} 779}
713 780
781/* away from the root */
714void inline_speed 782void inline_speed
715downheap (WT *heap, int N, int k) 783downheap (WT *heap, int N, int k)
716{ 784{
717 WT w = heap [k]; 785 WT w = heap [k];
718 786
… …
749/*****************************************************************************/ 817/*****************************************************************************/
750 818
751typedef struct 819typedef struct
752{ 820{
753 WL head; 821 WL head;
754 sig_atomic_t volatile gotsig; 822 EV_ATOMIC_T gotsig;
755} ANSIG; 823} ANSIG;
756 824
757static ANSIG *signals; 825static ANSIG *signals;
758static int signalmax; 826static int signalmax;
759 827
760static int sigpipe [2]; 828static EV_ATOMIC_T gotsig;
761static sig_atomic_t volatile gotsig;
762static ev_io sigev;
763 829
764void inline_size 830void inline_size
765signals_init (ANSIG *base, int count) 831signals_init (ANSIG *base, int count)
766{ 832{
767 while (count--) 833 while (count--)
… …
771 837
772 ++base; 838 ++base;
773 } 839 }
774} 840}
775 841
776static void 842/*****************************************************************************/
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 843
827void inline_speed 844void inline_speed
828fd_intern (int fd) 845fd_intern (int fd)
829{ 846{
830#ifdef _WIN32 847#ifdef _WIN32
… …
835 fcntl (fd, F_SETFL, O_NONBLOCK); 852 fcntl (fd, F_SETFL, O_NONBLOCK);
836#endif 853#endif
837} 854}
838 855
839static void noinline 856static void noinline
840siginit (EV_P) 857evpipe_init (EV_P)
841{ 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
842 fd_intern (sigpipe [0]); 874 fd_intern (evpipe [0]);
843 fd_intern (sigpipe [1]); 875 fd_intern (evpipe [1]);
876 ev_io_set (&pipeev, evpipe [0], EV_READ);
877 }
844 878
845 ev_io_set (&sigev, sigpipe [0], EV_READ);
846 ev_io_start (EV_A_ &sigev); 879 ev_io_start (EV_A_ &pipeev);
847 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
848} 947}
849 948
850/*****************************************************************************/ 949/*****************************************************************************/
851 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
852static WL childs [EV_PID_HASHSIZE]; 988static WL childs [EV_PID_HASHSIZE];
853 989
854#ifndef _WIN32 990#ifndef _WIN32
855 991
856static ev_signal childev; 992static ev_signal childev;
857 993
994#ifndef WIFCONTINUED
995# define WIFCONTINUED(status) 0
996#endif
997
858void inline_speed 998void inline_speed
859child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 999child_reap (EV_P_ int chain, int pid, int status)
860{ 1000{
861 ev_child *w; 1001 ev_child *w;
1002 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
862 1003
863 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 {
864 if (w->pid == pid || !w->pid) 1006 if ((w->pid == pid || !w->pid)
1007 && (!traced || (w->flags & 1)))
865 { 1008 {
866 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 */
867 w->rpid = pid; 1010 w->rpid = pid;
868 w->rstatus = status; 1011 w->rstatus = status;
869 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1012 ev_feed_event (EV_A_ (W)w, EV_CHILD);
870 } 1013 }
1014 }
871} 1015}
872 1016
873#ifndef WCONTINUED 1017#ifndef WCONTINUED
874# define WCONTINUED 0 1018# define WCONTINUED 0
875#endif 1019#endif
… …
884 if (!WCONTINUED 1028 if (!WCONTINUED
885 || errno != EINVAL 1029 || errno != EINVAL
886 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1030 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
887 return; 1031 return;
888 1032
889 /* 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 */
890 /* 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 */
891 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1035 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
892 1036
893 child_reap (EV_A_ sw, pid, pid, status); 1037 child_reap (EV_A_ pid, pid, status);
894 if (EV_PID_HASHSIZE > 1) 1038 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 */ 1039 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
896} 1040}
897 1041
898#endif 1042#endif
899 1043
900/*****************************************************************************/ 1044/*****************************************************************************/
… …
1018 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1162 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1019 have_monotonic = 1; 1163 have_monotonic = 1;
1020 } 1164 }
1021#endif 1165#endif
1022 1166
1023 ev_rt_now = ev_time (); 1167 ev_rt_now = ev_time ();
1024 mn_now = get_clock (); 1168 mn_now = get_clock ();
1025 now_floor = mn_now; 1169 now_floor = mn_now;
1026 rtmn_diff = ev_rt_now - mn_now; 1170 rtmn_diff = ev_rt_now - mn_now;
1027 1171
1028 io_blocktime = 0.; 1172 io_blocktime = 0.;
1029 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
1030 1180
1031 /* pid check not overridable via env */ 1181 /* pid check not overridable via env */
1032#ifndef _WIN32 1182#ifndef _WIN32
1033 if (flags & EVFLAG_FORKCHECK) 1183 if (flags & EVFLAG_FORKCHECK)
1034 curpid = getpid (); 1184 curpid = getpid ();
… …
1037 if (!(flags & EVFLAG_NOENV) 1187 if (!(flags & EVFLAG_NOENV)
1038 && !enable_secure () 1188 && !enable_secure ()
1039 && getenv ("LIBEV_FLAGS")) 1189 && getenv ("LIBEV_FLAGS"))
1040 flags = atoi (getenv ("LIBEV_FLAGS")); 1190 flags = atoi (getenv ("LIBEV_FLAGS"));
1041 1191
1042 if (!(flags & 0x0000ffffUL)) 1192 if (!(flags & 0x0000ffffU))
1043 flags |= ev_recommended_backends (); 1193 flags |= ev_recommended_backends ();
1044
1045 backend = 0;
1046 backend_fd = -1;
1047#if EV_USE_INOTIFY
1048 fs_fd = -2;
1049#endif
1050 1194
1051#if EV_USE_PORT 1195#if EV_USE_PORT
1052 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1196 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1053#endif 1197#endif
1054#if EV_USE_KQUEUE 1198#if EV_USE_KQUEUE
… …
1062#endif 1206#endif
1063#if EV_USE_SELECT 1207#if EV_USE_SELECT
1064 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1208 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1065#endif 1209#endif
1066 1210
1067 ev_init (&sigev, sigcb); 1211 ev_init (&pipeev, pipecb);
1068 ev_set_priority (&sigev, EV_MAXPRI); 1212 ev_set_priority (&pipeev, EV_MAXPRI);
1069 } 1213 }
1070} 1214}
1071 1215
1072static void noinline 1216static void noinline
1073loop_destroy (EV_P) 1217loop_destroy (EV_P)
1074{ 1218{
1075 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 }
1076 1237
1077#if EV_USE_INOTIFY 1238#if EV_USE_INOTIFY
1078 if (fs_fd >= 0) 1239 if (fs_fd >= 0)
1079 close (fs_fd); 1240 close (fs_fd);
1080#endif 1241#endif
… …
1117#if EV_FORK_ENABLE 1278#if EV_FORK_ENABLE
1118 array_free (fork, EMPTY); 1279 array_free (fork, EMPTY);
1119#endif 1280#endif
1120 array_free (prepare, EMPTY); 1281 array_free (prepare, EMPTY);
1121 array_free (check, EMPTY); 1282 array_free (check, EMPTY);
1283#if EV_ASYNC_ENABLE
1284 array_free (async, EMPTY);
1285#endif
1122 1286
1123 backend = 0; 1287 backend = 0;
1124} 1288}
1125 1289
1290#if EV_USE_INOTIFY
1126void inline_size infy_fork (EV_P); 1291void inline_size infy_fork (EV_P);
1292#endif
1127 1293
1128void inline_size 1294void inline_size
1129loop_fork (EV_P) 1295loop_fork (EV_P)
1130{ 1296{
1131#if EV_USE_PORT 1297#if EV_USE_PORT
… …
1139#endif 1305#endif
1140#if EV_USE_INOTIFY 1306#if EV_USE_INOTIFY
1141 infy_fork (EV_A); 1307 infy_fork (EV_A);
1142#endif 1308#endif
1143 1309
1144 if (ev_is_active (&sigev)) 1310 if (ev_is_active (&pipeev))
1145 { 1311 {
1146 /* 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
1147 1318
1148 ev_ref (EV_A); 1319 ev_ref (EV_A);
1149 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 {
1150 close (sigpipe [0]); 1329 close (evpipe [0]);
1151 close (sigpipe [1]); 1330 close (evpipe [1]);
1331 }
1152 1332
1153 while (pipe (sigpipe))
1154 syserr ("(libev) error creating pipe");
1155
1156 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);
1157 } 1336 }
1158 1337
1159 postfork = 0; 1338 postfork = 0;
1160} 1339}
1161 1340
… …
1183} 1362}
1184 1363
1185void 1364void
1186ev_loop_fork (EV_P) 1365ev_loop_fork (EV_P)
1187{ 1366{
1188 postfork = 1; 1367 postfork = 1; /* must be in line with ev_default_fork */
1189} 1368}
1190 1369
1191#endif 1370#endif
1192 1371
1193#if EV_MULTIPLICITY 1372#if EV_MULTIPLICITY
… …
1196#else 1375#else
1197int 1376int
1198ev_default_loop (unsigned int flags) 1377ev_default_loop (unsigned int flags)
1199#endif 1378#endif
1200{ 1379{
1201 if (sigpipe [0] == sigpipe [1])
1202 if (pipe (sigpipe))
1203 return 0;
1204
1205 if (!ev_default_loop_ptr) 1380 if (!ev_default_loop_ptr)
1206 { 1381 {
1207#if EV_MULTIPLICITY 1382#if EV_MULTIPLICITY
1208 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1383 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1209#else 1384#else
… …
1212 1387
1213 loop_init (EV_A_ flags); 1388 loop_init (EV_A_ flags);
1214 1389
1215 if (ev_backend (EV_A)) 1390 if (ev_backend (EV_A))
1216 { 1391 {
1217 siginit (EV_A);
1218
1219#ifndef _WIN32 1392#ifndef _WIN32
1220 ev_signal_init (&childev, childcb, SIGCHLD); 1393 ev_signal_init (&childev, childcb, SIGCHLD);
1221 ev_set_priority (&childev, EV_MAXPRI); 1394 ev_set_priority (&childev, EV_MAXPRI);
1222 ev_signal_start (EV_A_ &childev); 1395 ev_signal_start (EV_A_ &childev);
1223 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1396 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1240#ifndef _WIN32 1413#ifndef _WIN32
1241 ev_ref (EV_A); /* child watcher */ 1414 ev_ref (EV_A); /* child watcher */
1242 ev_signal_stop (EV_A_ &childev); 1415 ev_signal_stop (EV_A_ &childev);
1243#endif 1416#endif
1244 1417
1245 ev_ref (EV_A); /* signal watcher */
1246 ev_io_stop (EV_A_ &sigev);
1247
1248 close (sigpipe [0]); sigpipe [0] = 0;
1249 close (sigpipe [1]); sigpipe [1] = 0;
1250
1251 loop_destroy (EV_A); 1418 loop_destroy (EV_A);
1252} 1419}
1253 1420
1254void 1421void
1255ev_default_fork (void) 1422ev_default_fork (void)
… …
1257#if EV_MULTIPLICITY 1424#if EV_MULTIPLICITY
1258 struct ev_loop *loop = ev_default_loop_ptr; 1425 struct ev_loop *loop = ev_default_loop_ptr;
1259#endif 1426#endif
1260 1427
1261 if (backend) 1428 if (backend)
1262 postfork = 1; 1429 postfork = 1; /* must be in line with ev_loop_fork */
1263} 1430}
1264 1431
1265/*****************************************************************************/ 1432/*****************************************************************************/
1266 1433
1267void 1434void
… …
1476static int loop_done; 1643static int loop_done;
1477 1644
1478void 1645void
1479ev_loop (EV_P_ int flags) 1646ev_loop (EV_P_ int flags)
1480{ 1647{
1481 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1648 loop_done = EVUNLOOP_CANCEL;
1482 ? EVUNLOOP_ONE
1483 : EVUNLOOP_CANCEL;
1484 1649
1485 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 */
1486 1651
1487 do 1652 do
1488 { 1653 {
… …
1584 /* queue check watchers, to be executed first */ 1749 /* queue check watchers, to be executed first */
1585 if (expect_false (checkcnt)) 1750 if (expect_false (checkcnt))
1586 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1751 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1587 1752
1588 call_pending (EV_A); 1753 call_pending (EV_A);
1589
1590 } 1754 }
1591 while (expect_true (activecnt && !loop_done)); 1755 while (expect_true (
1756 activecnt
1757 && !loop_done
1758 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1759 ));
1592 1760
1593 if (loop_done == EVUNLOOP_ONE) 1761 if (loop_done == EVUNLOOP_ONE)
1594 loop_done = EVUNLOOP_CANCEL; 1762 loop_done = EVUNLOOP_CANCEL;
1595} 1763}
1596 1764
… …
1842 if (expect_false (ev_is_active (w))) 2010 if (expect_false (ev_is_active (w)))
1843 return; 2011 return;
1844 2012
1845 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));
1846 2014
2015 evpipe_init (EV_A);
2016
1847 { 2017 {
1848#ifndef _WIN32 2018#ifndef _WIN32
1849 sigset_t full, prev; 2019 sigset_t full, prev;
1850 sigfillset (&full); 2020 sigfillset (&full);
1851 sigprocmask (SIG_SETMASK, &full, &prev); 2021 sigprocmask (SIG_SETMASK, &full, &prev);
… …
1862 wlist_add (&signals [w->signum - 1].head, (WL)w); 2032 wlist_add (&signals [w->signum - 1].head, (WL)w);
1863 2033
1864 if (!((WL)w)->next) 2034 if (!((WL)w)->next)
1865 { 2035 {
1866#if _WIN32 2036#if _WIN32
1867 signal (w->signum, sighandler); 2037 signal (w->signum, ev_sighandler);
1868#else 2038#else
1869 struct sigaction sa; 2039 struct sigaction sa;
1870 sa.sa_handler = sighandler; 2040 sa.sa_handler = ev_sighandler;
1871 sigfillset (&sa.sa_mask); 2041 sigfillset (&sa.sa_mask);
1872 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 */
1873 sigaction (w->signum, &sa, 0); 2043 sigaction (w->signum, &sa, 0);
1874#endif 2044#endif
1875 } 2045 }
… …
2364 2534
2365 ev_stop (EV_A_ (W)w); 2535 ev_stop (EV_A_ (W)w);
2366} 2536}
2367#endif 2537#endif
2368 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
2369/*****************************************************************************/ 2577/*****************************************************************************/
2370 2578
2371struct ev_once 2579struct ev_once
2372{ 2580{
2373 ev_io io; 2581 ev_io io;

Diff Legend

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