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

Comparing libev/ev.c (file contents):
Revision 1.192 by root, Fri Dec 21 07:55:29 2007 UTC vs.
Revision 1.208 by root, Fri Feb 1 13:22:48 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
… …
51# ifndef EV_USE_MONOTONIC 59# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 60# define EV_USE_MONOTONIC 0
53# endif 61# endif
54# ifndef EV_USE_REALTIME 62# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 63# define EV_USE_REALTIME 0
64# endif
65# endif
66
67# ifndef EV_USE_NANOSLEEP
68# if HAVE_NANOSLEEP
69# define EV_USE_NANOSLEEP 1
70# else
71# define EV_USE_NANOSLEEP 0
56# endif 72# endif
57# endif 73# endif
58 74
59# ifndef EV_USE_SELECT 75# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 76# if HAVE_SELECT && HAVE_SYS_SELECT_H
… …
146 162
147#ifndef EV_USE_REALTIME 163#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0 164# define EV_USE_REALTIME 0
149#endif 165#endif
150 166
167#ifndef EV_USE_NANOSLEEP
168# define EV_USE_NANOSLEEP 0
169#endif
170
151#ifndef EV_USE_SELECT 171#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 172# define EV_USE_SELECT 1
153#endif 173#endif
154 174
155#ifndef EV_USE_POLL 175#ifndef EV_USE_POLL
… …
205#endif 225#endif
206 226
207#if !EV_STAT_ENABLE 227#if !EV_STAT_ENABLE
208# undef EV_USE_INOTIFY 228# undef EV_USE_INOTIFY
209# define EV_USE_INOTIFY 0 229# define EV_USE_INOTIFY 0
230#endif
231
232#if !EV_USE_NANOSLEEP
233# ifndef _WIN32
234# include <sys/select.h>
235# endif
210#endif 236#endif
211 237
212#if EV_USE_INOTIFY 238#if EV_USE_INOTIFY
213# include <sys/inotify.h> 239# include <sys/inotify.h>
214#endif 240#endif
… …
262 288
263typedef ev_watcher *W; 289typedef ev_watcher *W;
264typedef ev_watcher_list *WL; 290typedef ev_watcher_list *WL;
265typedef ev_watcher_time *WT; 291typedef ev_watcher_time *WT;
266 292
293#if EV_USE_MONOTONIC
294/* sig_atomic_t is used to avoid per-thread variables or locking but still */
295/* giving it a reasonably high chance of working on typical architetcures */
267static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 296static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
297#endif
268 298
269#ifdef _WIN32 299#ifdef _WIN32
270# include "ev_win32.c" 300# include "ev_win32.c"
271#endif 301#endif
272 302
… …
408{ 438{
409 return ev_rt_now; 439 return ev_rt_now;
410} 440}
411#endif 441#endif
412 442
443void
444ev_sleep (ev_tstamp delay)
445{
446 if (delay > 0.)
447 {
448#if EV_USE_NANOSLEEP
449 struct timespec ts;
450
451 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453
454 nanosleep (&ts, 0);
455#elif defined(_WIN32)
456 Sleep (delay * 1e3);
457#else
458 struct timeval tv;
459
460 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
462
463 select (0, 0, 0, 0, &tv);
464#endif
465 }
466}
467
468/*****************************************************************************/
469
413int inline_size 470int inline_size
414array_nextsize (int elem, int cur, int cnt) 471array_nextsize (int elem, int cur, int cnt)
415{ 472{
416 int ncur = cur + 1; 473 int ncur = cur + 1;
417 474
… …
543 600
544#if EV_SELECT_IS_WINSOCKET 601#if EV_SELECT_IS_WINSOCKET
545 if (events) 602 if (events)
546 { 603 {
547 unsigned long argp; 604 unsigned long argp;
605 #ifdef EV_FD_TO_WIN32_HANDLE
606 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
607 #else
548 anfd->handle = _get_osfhandle (fd); 608 anfd->handle = _get_osfhandle (fd);
609 #endif
549 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 610 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
550 } 611 }
551#endif 612#endif
552 613
553 { 614 {
… …
702/*****************************************************************************/ 763/*****************************************************************************/
703 764
704typedef struct 765typedef struct
705{ 766{
706 WL head; 767 WL head;
707 sig_atomic_t volatile gotsig; 768 EV_ATOMIC_T gotsig;
708} ANSIG; 769} ANSIG;
709 770
710static ANSIG *signals; 771static ANSIG *signals;
711static int signalmax; 772static int signalmax;
712 773
713static int sigpipe [2]; 774static EV_ATOMIC_T gotsig;
714static sig_atomic_t volatile gotsig;
715static ev_io sigev;
716 775
717void inline_size 776void inline_size
718signals_init (ANSIG *base, int count) 777signals_init (ANSIG *base, int count)
719{ 778{
720 while (count--) 779 while (count--)
… …
724 783
725 ++base; 784 ++base;
726 } 785 }
727} 786}
728 787
729static void 788/*****************************************************************************/
730sighandler (int signum)
731{
732#if _WIN32
733 signal (signum, sighandler);
734#endif
735
736 signals [signum - 1].gotsig = 1;
737
738 if (!gotsig)
739 {
740 int old_errno = errno;
741 gotsig = 1;
742 write (sigpipe [1], &signum, 1);
743 errno = old_errno;
744 }
745}
746
747void noinline
748ev_feed_signal_event (EV_P_ int signum)
749{
750 WL w;
751
752#if EV_MULTIPLICITY
753 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
754#endif
755
756 --signum;
757
758 if (signum < 0 || signum >= signalmax)
759 return;
760
761 signals [signum].gotsig = 0;
762
763 for (w = signals [signum].head; w; w = w->next)
764 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
765}
766
767static void
768sigcb (EV_P_ ev_io *iow, int revents)
769{
770 int signum;
771
772 read (sigpipe [0], &revents, 1);
773 gotsig = 0;
774
775 for (signum = signalmax; signum--; )
776 if (signals [signum].gotsig)
777 ev_feed_signal_event (EV_A_ signum + 1);
778}
779 789
780void inline_speed 790void inline_speed
781fd_intern (int fd) 791fd_intern (int fd)
782{ 792{
783#ifdef _WIN32 793#ifdef _WIN32
… …
788 fcntl (fd, F_SETFL, O_NONBLOCK); 798 fcntl (fd, F_SETFL, O_NONBLOCK);
789#endif 799#endif
790} 800}
791 801
792static void noinline 802static void noinline
793siginit (EV_P) 803evpipe_init (EV_P)
794{ 804{
805 if (!ev_is_active (&pipeev))
806 {
807 while (pipe (evpipe))
808 syserr ("(libev) error creating signal/async pipe");
809
795 fd_intern (sigpipe [0]); 810 fd_intern (evpipe [0]);
796 fd_intern (sigpipe [1]); 811 fd_intern (evpipe [1]);
797 812
798 ev_io_set (&sigev, sigpipe [0], EV_READ); 813 ev_io_set (&pipeev, evpipe [0], EV_READ);
799 ev_io_start (EV_A_ &sigev); 814 ev_io_start (EV_A_ &pipeev);
800 ev_unref (EV_A); /* child watcher should not keep loop alive */ 815 ev_unref (EV_A); /* child watcher should not keep loop alive */
816 }
817}
818
819void inline_size
820evpipe_write (EV_P_ int sig, int async)
821{
822 if (!(gotasync || gotsig))
823 {
824 int old_errno = errno;
825
826 if (sig) gotsig = 1;
827 if (async) gotasync = 1;
828
829 write (evpipe [1], &old_errno, 1);
830 errno = old_errno;
831 }
832}
833
834static void
835pipecb (EV_P_ ev_io *iow, int revents)
836{
837 {
838 int dummy;
839 read (evpipe [0], &dummy, 1);
840 }
841
842 if (gotsig)
843 {
844 int signum;
845 gotsig = 0;
846
847 for (signum = signalmax; signum--; )
848 if (signals [signum].gotsig)
849 ev_feed_signal_event (EV_A_ signum + 1);
850 }
851
852 if (gotasync)
853 {
854 int i;
855 gotasync = 0;
856
857 for (i = asynccnt; i--; )
858 if (asyncs [i]->sent)
859 {
860 asyncs [i]->sent = 0;
861 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
862 }
863 }
801} 864}
802 865
803/*****************************************************************************/ 866/*****************************************************************************/
804 867
868static void
869sighandler (int signum)
870{
871#if EV_MULTIPLICITY
872 struct ev_loop *loop = &default_loop_struct;
873#endif
874
875#if _WIN32
876 signal (signum, sighandler);
877#endif
878
879 signals [signum - 1].gotsig = 1;
880 evpipe_write (EV_A_ 1, 0);
881}
882
883void noinline
884ev_feed_signal_event (EV_P_ int signum)
885{
886 WL w;
887
888#if EV_MULTIPLICITY
889 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
890#endif
891
892 --signum;
893
894 if (signum < 0 || signum >= signalmax)
895 return;
896
897 signals [signum].gotsig = 0;
898
899 for (w = signals [signum].head; w; w = w->next)
900 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
901}
902
903/*****************************************************************************/
904
805static WL childs [EV_PID_HASHSIZE]; 905static WL childs [EV_PID_HASHSIZE];
806 906
807#ifndef _WIN32 907#ifndef _WIN32
808 908
809static ev_signal childev; 909static ev_signal childev;
910
911#ifndef WIFCONTINUED
912# define WIFCONTINUED(status) 0
913#endif
810 914
811void inline_speed 915void inline_speed
812child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 916child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
813{ 917{
814 ev_child *w; 918 ev_child *w;
919 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
815 920
816 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 921 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
922 {
817 if (w->pid == pid || !w->pid) 923 if ((w->pid == pid || !w->pid)
924 && (!traced || (w->flags & 1)))
818 { 925 {
819 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 926 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
820 w->rpid = pid; 927 w->rpid = pid;
821 w->rstatus = status; 928 w->rstatus = status;
822 ev_feed_event (EV_A_ (W)w, EV_CHILD); 929 ev_feed_event (EV_A_ (W)w, EV_CHILD);
823 } 930 }
931 }
824} 932}
825 933
826#ifndef WCONTINUED 934#ifndef WCONTINUED
827# define WCONTINUED 0 935# define WCONTINUED 0
828#endif 936#endif
… …
925} 1033}
926 1034
927unsigned int 1035unsigned int
928ev_embeddable_backends (void) 1036ev_embeddable_backends (void)
929{ 1037{
1038 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1039
930 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1040 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
931 return EVBACKEND_KQUEUE 1041 /* please fix it and tell me how to detect the fix */
932 | EVBACKEND_PORT; 1042 flags &= ~EVBACKEND_EPOLL;
1043
1044 return flags;
933} 1045}
934 1046
935unsigned int 1047unsigned int
936ev_backend (EV_P) 1048ev_backend (EV_P)
937{ 1049{
… …
940 1052
941unsigned int 1053unsigned int
942ev_loop_count (EV_P) 1054ev_loop_count (EV_P)
943{ 1055{
944 return loop_count; 1056 return loop_count;
1057}
1058
1059void
1060ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1061{
1062 io_blocktime = interval;
1063}
1064
1065void
1066ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1067{
1068 timeout_blocktime = interval;
945} 1069}
946 1070
947static void noinline 1071static void noinline
948loop_init (EV_P_ unsigned int flags) 1072loop_init (EV_P_ unsigned int flags)
949{ 1073{
… …
960 ev_rt_now = ev_time (); 1084 ev_rt_now = ev_time ();
961 mn_now = get_clock (); 1085 mn_now = get_clock ();
962 now_floor = mn_now; 1086 now_floor = mn_now;
963 rtmn_diff = ev_rt_now - mn_now; 1087 rtmn_diff = ev_rt_now - mn_now;
964 1088
1089 io_blocktime = 0.;
1090 timeout_blocktime = 0.;
1091
965 /* pid check not overridable via env */ 1092 /* pid check not overridable via env */
966#ifndef _WIN32 1093#ifndef _WIN32
967 if (flags & EVFLAG_FORKCHECK) 1094 if (flags & EVFLAG_FORKCHECK)
968 curpid = getpid (); 1095 curpid = getpid ();
969#endif 1096#endif
… …
996#endif 1123#endif
997#if EV_USE_SELECT 1124#if EV_USE_SELECT
998 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1125 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
999#endif 1126#endif
1000 1127
1001 ev_init (&sigev, sigcb); 1128 ev_init (&pipeev, pipecb);
1002 ev_set_priority (&sigev, EV_MAXPRI); 1129 ev_set_priority (&pipeev, EV_MAXPRI);
1003 } 1130 }
1004} 1131}
1005 1132
1006static void noinline 1133static void noinline
1007loop_destroy (EV_P) 1134loop_destroy (EV_P)
1008{ 1135{
1009 int i; 1136 int i;
1137
1138 if (ev_is_active (&pipeev))
1139 {
1140 ev_ref (EV_A); /* signal watcher */
1141 ev_io_stop (EV_A_ &pipeev);
1142
1143 close (evpipe [0]); evpipe [0] = 0;
1144 close (evpipe [1]); evpipe [1] = 0;
1145 }
1010 1146
1011#if EV_USE_INOTIFY 1147#if EV_USE_INOTIFY
1012 if (fs_fd >= 0) 1148 if (fs_fd >= 0)
1013 close (fs_fd); 1149 close (fs_fd);
1014#endif 1150#endif
… …
1073#endif 1209#endif
1074#if EV_USE_INOTIFY 1210#if EV_USE_INOTIFY
1075 infy_fork (EV_A); 1211 infy_fork (EV_A);
1076#endif 1212#endif
1077 1213
1078 if (ev_is_active (&sigev)) 1214 if (ev_is_active (&pipeev))
1079 { 1215 {
1080 /* default loop */ 1216 /* this "locks" the handlers against writing to the pipe */
1217 gotsig = gotasync = 1;
1081 1218
1082 ev_ref (EV_A); 1219 ev_ref (EV_A);
1083 ev_io_stop (EV_A_ &sigev); 1220 ev_io_stop (EV_A_ &pipeev);
1084 close (sigpipe [0]); 1221 close (evpipe [0]);
1085 close (sigpipe [1]); 1222 close (evpipe [1]);
1086 1223
1087 while (pipe (sigpipe))
1088 syserr ("(libev) error creating pipe");
1089
1090 siginit (EV_A); 1224 evpipe_init (EV_A);
1225 /* now iterate over everything, in case we missed something */
1226 pipecb (EV_A_ &pipeev, EV_READ);
1091 } 1227 }
1092 1228
1093 postfork = 0; 1229 postfork = 0;
1094} 1230}
1095 1231
… …
1117} 1253}
1118 1254
1119void 1255void
1120ev_loop_fork (EV_P) 1256ev_loop_fork (EV_P)
1121{ 1257{
1122 postfork = 1; 1258 postfork = 1; /* must be in line with ev_default_fork */
1123} 1259}
1124 1260
1125#endif 1261#endif
1126 1262
1127#if EV_MULTIPLICITY 1263#if EV_MULTIPLICITY
… …
1130#else 1266#else
1131int 1267int
1132ev_default_loop (unsigned int flags) 1268ev_default_loop (unsigned int flags)
1133#endif 1269#endif
1134{ 1270{
1135 if (sigpipe [0] == sigpipe [1])
1136 if (pipe (sigpipe))
1137 return 0;
1138
1139 if (!ev_default_loop_ptr) 1271 if (!ev_default_loop_ptr)
1140 { 1272 {
1141#if EV_MULTIPLICITY 1273#if EV_MULTIPLICITY
1142 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1274 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1143#else 1275#else
… …
1146 1278
1147 loop_init (EV_A_ flags); 1279 loop_init (EV_A_ flags);
1148 1280
1149 if (ev_backend (EV_A)) 1281 if (ev_backend (EV_A))
1150 { 1282 {
1151 siginit (EV_A);
1152
1153#ifndef _WIN32 1283#ifndef _WIN32
1154 ev_signal_init (&childev, childcb, SIGCHLD); 1284 ev_signal_init (&childev, childcb, SIGCHLD);
1155 ev_set_priority (&childev, EV_MAXPRI); 1285 ev_set_priority (&childev, EV_MAXPRI);
1156 ev_signal_start (EV_A_ &childev); 1286 ev_signal_start (EV_A_ &childev);
1157 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1287 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1174#ifndef _WIN32 1304#ifndef _WIN32
1175 ev_ref (EV_A); /* child watcher */ 1305 ev_ref (EV_A); /* child watcher */
1176 ev_signal_stop (EV_A_ &childev); 1306 ev_signal_stop (EV_A_ &childev);
1177#endif 1307#endif
1178 1308
1179 ev_ref (EV_A); /* signal watcher */
1180 ev_io_stop (EV_A_ &sigev);
1181
1182 close (sigpipe [0]); sigpipe [0] = 0;
1183 close (sigpipe [1]); sigpipe [1] = 0;
1184
1185 loop_destroy (EV_A); 1309 loop_destroy (EV_A);
1186} 1310}
1187 1311
1188void 1312void
1189ev_default_fork (void) 1313ev_default_fork (void)
… …
1191#if EV_MULTIPLICITY 1315#if EV_MULTIPLICITY
1192 struct ev_loop *loop = ev_default_loop_ptr; 1316 struct ev_loop *loop = ev_default_loop_ptr;
1193#endif 1317#endif
1194 1318
1195 if (backend) 1319 if (backend)
1196 postfork = 1; 1320 postfork = 1; /* must be in line with ev_loop_fork */
1197} 1321}
1198 1322
1199/*****************************************************************************/ 1323/*****************************************************************************/
1200 1324
1201void 1325void
… …
1456 /* update fd-related kernel structures */ 1580 /* update fd-related kernel structures */
1457 fd_reify (EV_A); 1581 fd_reify (EV_A);
1458 1582
1459 /* calculate blocking time */ 1583 /* calculate blocking time */
1460 { 1584 {
1461 ev_tstamp block; 1585 ev_tstamp waittime = 0.;
1586 ev_tstamp sleeptime = 0.;
1462 1587
1463 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1588 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1464 block = 0.; /* do not block at all */
1465 else
1466 { 1589 {
1467 /* update time to cancel out callback processing overhead */ 1590 /* update time to cancel out callback processing overhead */
1468 time_update (EV_A_ 1e100); 1591 time_update (EV_A_ 1e100);
1469 1592
1470 block = MAX_BLOCKTIME; 1593 waittime = MAX_BLOCKTIME;
1471 1594
1472 if (timercnt) 1595 if (timercnt)
1473 { 1596 {
1474 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1597 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1475 if (block > to) block = to; 1598 if (waittime > to) waittime = to;
1476 } 1599 }
1477 1600
1478#if EV_PERIODIC_ENABLE 1601#if EV_PERIODIC_ENABLE
1479 if (periodiccnt) 1602 if (periodiccnt)
1480 { 1603 {
1481 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1604 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1482 if (block > to) block = to; 1605 if (waittime > to) waittime = to;
1483 } 1606 }
1484#endif 1607#endif
1485 1608
1486 if (expect_false (block < 0.)) block = 0.; 1609 if (expect_false (waittime < timeout_blocktime))
1610 waittime = timeout_blocktime;
1611
1612 sleeptime = waittime - backend_fudge;
1613
1614 if (expect_true (sleeptime > io_blocktime))
1615 sleeptime = io_blocktime;
1616
1617 if (sleeptime)
1618 {
1619 ev_sleep (sleeptime);
1620 waittime -= sleeptime;
1621 }
1487 } 1622 }
1488 1623
1489 ++loop_count; 1624 ++loop_count;
1490 backend_poll (EV_A_ block); 1625 backend_poll (EV_A_ waittime);
1491 1626
1492 /* update ev_rt_now, do magic */ 1627 /* update ev_rt_now, do magic */
1493 time_update (EV_A_ block); 1628 time_update (EV_A_ waittime + sleeptime);
1494 } 1629 }
1495 1630
1496 /* queue pending timers and reschedule them */ 1631 /* queue pending timers and reschedule them */
1497 timers_reify (EV_A); /* relative timers called last */ 1632 timers_reify (EV_A); /* relative timers called last */
1498#if EV_PERIODIC_ENABLE 1633#if EV_PERIODIC_ENABLE
… …
1764#endif 1899#endif
1765 if (expect_false (ev_is_active (w))) 1900 if (expect_false (ev_is_active (w)))
1766 return; 1901 return;
1767 1902
1768 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1903 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1904
1905 evpipe_init (EV_A);
1769 1906
1770 { 1907 {
1771#ifndef _WIN32 1908#ifndef _WIN32
1772 sigset_t full, prev; 1909 sigset_t full, prev;
1773 sigfillset (&full); 1910 sigfillset (&full);
… …
2193 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2330 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2194 2331
2195 if (ev_cb (w)) 2332 if (ev_cb (w))
2196 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2333 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2197 else 2334 else
2198 ev_embed_sweep (loop, w); 2335 ev_loop (w->other, EVLOOP_NONBLOCK);
2199} 2336}
2200 2337
2201static void 2338static void
2202embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 2339embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2203{ 2340{
2204 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 2341 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2205 2342
2206 fd_reify (w->other); 2343 {
2344 struct ev_loop *loop = w->other;
2345
2346 while (fdchangecnt)
2347 {
2348 fd_reify (EV_A);
2349 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2350 }
2351 }
2207} 2352}
2353
2354#if 0
2355static void
2356embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2357{
2358 ev_idle_stop (EV_A_ idle);
2359}
2360#endif
2208 2361
2209void 2362void
2210ev_embed_start (EV_P_ ev_embed *w) 2363ev_embed_start (EV_P_ ev_embed *w)
2211{ 2364{
2212 if (expect_false (ev_is_active (w))) 2365 if (expect_false (ev_is_active (w)))
… …
2223 2376
2224 ev_prepare_init (&w->prepare, embed_prepare_cb); 2377 ev_prepare_init (&w->prepare, embed_prepare_cb);
2225 ev_set_priority (&w->prepare, EV_MINPRI); 2378 ev_set_priority (&w->prepare, EV_MINPRI);
2226 ev_prepare_start (EV_A_ &w->prepare); 2379 ev_prepare_start (EV_A_ &w->prepare);
2227 2380
2381 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2382
2228 ev_start (EV_A_ (W)w, 1); 2383 ev_start (EV_A_ (W)w, 1);
2229} 2384}
2230 2385
2231void 2386void
2232ev_embed_stop (EV_P_ ev_embed *w) 2387ev_embed_stop (EV_P_ ev_embed *w)
… …
2269 2424
2270 ev_stop (EV_A_ (W)w); 2425 ev_stop (EV_A_ (W)w);
2271} 2426}
2272#endif 2427#endif
2273 2428
2429#if EV_ASYNC_ENABLE
2430void
2431ev_async_start (EV_P_ ev_async *w)
2432{
2433 if (expect_false (ev_is_active (w)))
2434 return;
2435
2436 evpipe_init (EV_A);
2437
2438 ev_start (EV_A_ (W)w, ++asynccnt);
2439 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2440 asyncs [asynccnt - 1] = w;
2441}
2442
2443void
2444ev_async_stop (EV_P_ ev_async *w)
2445{
2446 clear_pending (EV_A_ (W)w);
2447 if (expect_false (!ev_is_active (w)))
2448 return;
2449
2450 {
2451 int active = ((W)w)->active;
2452 asyncs [active - 1] = asyncs [--asynccnt];
2453 ((W)asyncs [active - 1])->active = active;
2454 }
2455
2456 ev_stop (EV_A_ (W)w);
2457}
2458
2459void
2460ev_async_send (EV_P_ ev_async *w)
2461{
2462 w->sent = 1;
2463 evpipe_write (EV_A_ 0, 1);
2464}
2465#endif
2466
2274/*****************************************************************************/ 2467/*****************************************************************************/
2275 2468
2276struct ev_once 2469struct ev_once
2277{ 2470{
2278 ev_io io; 2471 ev_io io;

Diff Legend

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