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

Comparing libev/ev.c (file contents):
Revision 1.193 by root, Sat Dec 22 05:47:58 2007 UTC vs.
Revision 1.211 by root, Tue Feb 19 17:09:28 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
… …
280 288
281typedef ev_watcher *W; 289typedef ev_watcher *W;
282typedef ev_watcher_list *WL; 290typedef ev_watcher_list *WL;
283typedef ev_watcher_time *WT; 291typedef ev_watcher_time *WT;
284 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 */
285static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 296static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
297#endif
286 298
287#ifdef _WIN32 299#ifdef _WIN32
288# include "ev_win32.c" 300# include "ev_win32.c"
289#endif 301#endif
290 302
… …
588 600
589#if EV_SELECT_IS_WINSOCKET 601#if EV_SELECT_IS_WINSOCKET
590 if (events) 602 if (events)
591 { 603 {
592 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
593 anfd->handle = _get_osfhandle (fd); 608 anfd->handle = _get_osfhandle (fd);
609 #endif
594 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));
595 } 611 }
596#endif 612#endif
597 613
598 { 614 {
… …
747/*****************************************************************************/ 763/*****************************************************************************/
748 764
749typedef struct 765typedef struct
750{ 766{
751 WL head; 767 WL head;
752 sig_atomic_t volatile gotsig; 768 EV_ATOMIC_T gotsig;
753} ANSIG; 769} ANSIG;
754 770
755static ANSIG *signals; 771static ANSIG *signals;
756static int signalmax; 772static int signalmax;
757 773
758static int sigpipe [2]; 774static EV_ATOMIC_T gotsig;
759static sig_atomic_t volatile gotsig;
760static ev_io sigev;
761 775
762void inline_size 776void inline_size
763signals_init (ANSIG *base, int count) 777signals_init (ANSIG *base, int count)
764{ 778{
765 while (count--) 779 while (count--)
… …
769 783
770 ++base; 784 ++base;
771 } 785 }
772} 786}
773 787
774static void 788/*****************************************************************************/
775sighandler (int signum)
776{
777#if _WIN32
778 signal (signum, sighandler);
779#endif
780
781 signals [signum - 1].gotsig = 1;
782
783 if (!gotsig)
784 {
785 int old_errno = errno;
786 gotsig = 1;
787 write (sigpipe [1], &signum, 1);
788 errno = old_errno;
789 }
790}
791
792void noinline
793ev_feed_signal_event (EV_P_ int signum)
794{
795 WL w;
796
797#if EV_MULTIPLICITY
798 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
799#endif
800
801 --signum;
802
803 if (signum < 0 || signum >= signalmax)
804 return;
805
806 signals [signum].gotsig = 0;
807
808 for (w = signals [signum].head; w; w = w->next)
809 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
810}
811
812static void
813sigcb (EV_P_ ev_io *iow, int revents)
814{
815 int signum;
816
817 read (sigpipe [0], &revents, 1);
818 gotsig = 0;
819
820 for (signum = signalmax; signum--; )
821 if (signals [signum].gotsig)
822 ev_feed_signal_event (EV_A_ signum + 1);
823}
824 789
825void inline_speed 790void inline_speed
826fd_intern (int fd) 791fd_intern (int fd)
827{ 792{
828#ifdef _WIN32 793#ifdef _WIN32
… …
833 fcntl (fd, F_SETFL, O_NONBLOCK); 798 fcntl (fd, F_SETFL, O_NONBLOCK);
834#endif 799#endif
835} 800}
836 801
837static void noinline 802static void noinline
838siginit (EV_P) 803evpipe_init (EV_P)
839{ 804{
805 if (!ev_is_active (&pipeev))
806 {
807 while (pipe (evpipe))
808 syserr ("(libev) error creating signal/async pipe");
809
840 fd_intern (sigpipe [0]); 810 fd_intern (evpipe [0]);
841 fd_intern (sigpipe [1]); 811 fd_intern (evpipe [1]);
842 812
843 ev_io_set (&sigev, sigpipe [0], EV_READ); 813 ev_io_set (&pipeev, evpipe [0], EV_READ);
844 ev_io_start (EV_A_ &sigev); 814 ev_io_start (EV_A_ &pipeev);
845 ev_unref (EV_A); /* child watcher should not keep loop alive */ 815 ev_unref (EV_A); /* watcher should not keep loop alive */
816
817 /* in case we received the signal before we had the chance of installing a handler */
818 ev_feed_event (EV_A_ &pipeev, 0);
819 }
820}
821
822void inline_size
823evpipe_write (EV_P_ int sig, int async)
824{
825 if (!(gotasync || gotsig))
826 {
827 int old_errno = errno; /* save errno becaue write might clobber it */
828
829 if (sig) gotsig = 1;
830 if (async) gotasync = 1;
831
832 write (evpipe [1], &old_errno, 1);
833
834 errno = old_errno;
835 }
836}
837
838static void
839pipecb (EV_P_ ev_io *iow, int revents)
840{
841 {
842 int dummy;
843 read (evpipe [0], &dummy, 1);
844 }
845
846 if (gotsig && ev_is_default_loop (EV_A))
847 {
848 int signum;
849 gotsig = 0;
850
851 for (signum = signalmax; signum--; )
852 if (signals [signum].gotsig)
853 ev_feed_signal_event (EV_A_ signum + 1);
854 }
855
856#if EV_ASYNC_ENABLE
857 if (gotasync)
858 {
859 int i;
860 gotasync = 0;
861
862 for (i = asynccnt; i--; )
863 if (asyncs [i]->sent)
864 {
865 asyncs [i]->sent = 0;
866 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
867 }
868 }
869#endif
846} 870}
847 871
848/*****************************************************************************/ 872/*****************************************************************************/
849 873
874static void
875sighandler (int signum)
876{
877#if EV_MULTIPLICITY
878 struct ev_loop *loop = &default_loop_struct;
879#endif
880
881#if _WIN32
882 signal (signum, sighandler);
883#endif
884
885 signals [signum - 1].gotsig = 1;
886 evpipe_write (EV_A_ 1, 0);
887}
888
889void noinline
890ev_feed_signal_event (EV_P_ int signum)
891{
892 WL w;
893
894#if EV_MULTIPLICITY
895 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
896#endif
897
898 --signum;
899
900 if (signum < 0 || signum >= signalmax)
901 return;
902
903 signals [signum].gotsig = 0;
904
905 for (w = signals [signum].head; w; w = w->next)
906 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
907}
908
909/*****************************************************************************/
910
850static WL childs [EV_PID_HASHSIZE]; 911static WL childs [EV_PID_HASHSIZE];
851 912
852#ifndef _WIN32 913#ifndef _WIN32
853 914
854static ev_signal childev; 915static ev_signal childev;
916
917#ifndef WIFCONTINUED
918# define WIFCONTINUED(status) 0
919#endif
855 920
856void inline_speed 921void inline_speed
857child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 922child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
858{ 923{
859 ev_child *w; 924 ev_child *w;
925 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
860 926
861 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 927 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
928 {
862 if (w->pid == pid || !w->pid) 929 if ((w->pid == pid || !w->pid)
930 && (!traced || (w->flags & 1)))
863 { 931 {
864 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 932 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
865 w->rpid = pid; 933 w->rpid = pid;
866 w->rstatus = status; 934 w->rstatus = status;
867 ev_feed_event (EV_A_ (W)w, EV_CHILD); 935 ev_feed_event (EV_A_ (W)w, EV_CHILD);
868 } 936 }
937 }
869} 938}
870 939
871#ifndef WCONTINUED 940#ifndef WCONTINUED
872# define WCONTINUED 0 941# define WCONTINUED 0
873#endif 942#endif
… …
970} 1039}
971 1040
972unsigned int 1041unsigned int
973ev_embeddable_backends (void) 1042ev_embeddable_backends (void)
974{ 1043{
1044 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1045
975 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1046 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
976 return EVBACKEND_KQUEUE 1047 /* please fix it and tell me how to detect the fix */
977 | EVBACKEND_PORT; 1048 flags &= ~EVBACKEND_EPOLL;
1049
1050 return flags;
978} 1051}
979 1052
980unsigned int 1053unsigned int
981ev_backend (EV_P) 1054ev_backend (EV_P)
982{ 1055{
… …
1012 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1085 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1013 have_monotonic = 1; 1086 have_monotonic = 1;
1014 } 1087 }
1015#endif 1088#endif
1016 1089
1017 ev_rt_now = ev_time (); 1090 ev_rt_now = ev_time ();
1018 mn_now = get_clock (); 1091 mn_now = get_clock ();
1019 now_floor = mn_now; 1092 now_floor = mn_now;
1020 rtmn_diff = ev_rt_now - mn_now; 1093 rtmn_diff = ev_rt_now - mn_now;
1021 1094
1022 io_blocktime = 0.; 1095 io_blocktime = 0.;
1023 timeout_blocktime = 0.; 1096 timeout_blocktime = 0.;
1097 backend = 0;
1098 backend_fd = -1;
1099 gotasync = 0;
1100#if EV_USE_INOTIFY
1101 fs_fd = -2;
1102#endif
1024 1103
1025 /* pid check not overridable via env */ 1104 /* pid check not overridable via env */
1026#ifndef _WIN32 1105#ifndef _WIN32
1027 if (flags & EVFLAG_FORKCHECK) 1106 if (flags & EVFLAG_FORKCHECK)
1028 curpid = getpid (); 1107 curpid = getpid ();
… …
1034 flags = atoi (getenv ("LIBEV_FLAGS")); 1113 flags = atoi (getenv ("LIBEV_FLAGS"));
1035 1114
1036 if (!(flags & 0x0000ffffUL)) 1115 if (!(flags & 0x0000ffffUL))
1037 flags |= ev_recommended_backends (); 1116 flags |= ev_recommended_backends ();
1038 1117
1039 backend = 0;
1040 backend_fd = -1;
1041#if EV_USE_INOTIFY
1042 fs_fd = -2;
1043#endif
1044
1045#if EV_USE_PORT 1118#if EV_USE_PORT
1046 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1119 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1047#endif 1120#endif
1048#if EV_USE_KQUEUE 1121#if EV_USE_KQUEUE
1049 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1122 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1056#endif 1129#endif
1057#if EV_USE_SELECT 1130#if EV_USE_SELECT
1058 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1131 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1059#endif 1132#endif
1060 1133
1061 ev_init (&sigev, sigcb); 1134 ev_init (&pipeev, pipecb);
1062 ev_set_priority (&sigev, EV_MAXPRI); 1135 ev_set_priority (&pipeev, EV_MAXPRI);
1063 } 1136 }
1064} 1137}
1065 1138
1066static void noinline 1139static void noinline
1067loop_destroy (EV_P) 1140loop_destroy (EV_P)
1068{ 1141{
1069 int i; 1142 int i;
1143
1144 if (ev_is_active (&pipeev))
1145 {
1146 ev_ref (EV_A); /* signal watcher */
1147 ev_io_stop (EV_A_ &pipeev);
1148
1149 close (evpipe [0]); evpipe [0] = 0;
1150 close (evpipe [1]); evpipe [1] = 0;
1151 }
1070 1152
1071#if EV_USE_INOTIFY 1153#if EV_USE_INOTIFY
1072 if (fs_fd >= 0) 1154 if (fs_fd >= 0)
1073 close (fs_fd); 1155 close (fs_fd);
1074#endif 1156#endif
… …
1111#if EV_FORK_ENABLE 1193#if EV_FORK_ENABLE
1112 array_free (fork, EMPTY); 1194 array_free (fork, EMPTY);
1113#endif 1195#endif
1114 array_free (prepare, EMPTY); 1196 array_free (prepare, EMPTY);
1115 array_free (check, EMPTY); 1197 array_free (check, EMPTY);
1198#if EV_ASYNC_ENABLE
1199 array_free (async, EMPTY);
1200#endif
1116 1201
1117 backend = 0; 1202 backend = 0;
1118} 1203}
1119 1204
1120void inline_size infy_fork (EV_P); 1205void inline_size infy_fork (EV_P);
… …
1133#endif 1218#endif
1134#if EV_USE_INOTIFY 1219#if EV_USE_INOTIFY
1135 infy_fork (EV_A); 1220 infy_fork (EV_A);
1136#endif 1221#endif
1137 1222
1138 if (ev_is_active (&sigev)) 1223 if (ev_is_active (&pipeev))
1139 { 1224 {
1140 /* default loop */ 1225 /* this "locks" the handlers against writing to the pipe */
1226 gotsig = gotasync = 1;
1141 1227
1142 ev_ref (EV_A); 1228 ev_ref (EV_A);
1143 ev_io_stop (EV_A_ &sigev); 1229 ev_io_stop (EV_A_ &pipeev);
1144 close (sigpipe [0]); 1230 close (evpipe [0]);
1145 close (sigpipe [1]); 1231 close (evpipe [1]);
1146 1232
1147 while (pipe (sigpipe))
1148 syserr ("(libev) error creating pipe");
1149
1150 siginit (EV_A); 1233 evpipe_init (EV_A);
1234 /* now iterate over everything, in case we missed something */
1235 pipecb (EV_A_ &pipeev, EV_READ);
1151 } 1236 }
1152 1237
1153 postfork = 0; 1238 postfork = 0;
1154} 1239}
1155 1240
… …
1177} 1262}
1178 1263
1179void 1264void
1180ev_loop_fork (EV_P) 1265ev_loop_fork (EV_P)
1181{ 1266{
1182 postfork = 1; 1267 postfork = 1; /* must be in line with ev_default_fork */
1183} 1268}
1184 1269
1185#endif 1270#endif
1186 1271
1187#if EV_MULTIPLICITY 1272#if EV_MULTIPLICITY
… …
1190#else 1275#else
1191int 1276int
1192ev_default_loop (unsigned int flags) 1277ev_default_loop (unsigned int flags)
1193#endif 1278#endif
1194{ 1279{
1195 if (sigpipe [0] == sigpipe [1])
1196 if (pipe (sigpipe))
1197 return 0;
1198
1199 if (!ev_default_loop_ptr) 1280 if (!ev_default_loop_ptr)
1200 { 1281 {
1201#if EV_MULTIPLICITY 1282#if EV_MULTIPLICITY
1202 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1283 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1203#else 1284#else
… …
1206 1287
1207 loop_init (EV_A_ flags); 1288 loop_init (EV_A_ flags);
1208 1289
1209 if (ev_backend (EV_A)) 1290 if (ev_backend (EV_A))
1210 { 1291 {
1211 siginit (EV_A);
1212
1213#ifndef _WIN32 1292#ifndef _WIN32
1214 ev_signal_init (&childev, childcb, SIGCHLD); 1293 ev_signal_init (&childev, childcb, SIGCHLD);
1215 ev_set_priority (&childev, EV_MAXPRI); 1294 ev_set_priority (&childev, EV_MAXPRI);
1216 ev_signal_start (EV_A_ &childev); 1295 ev_signal_start (EV_A_ &childev);
1217 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1296 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1234#ifndef _WIN32 1313#ifndef _WIN32
1235 ev_ref (EV_A); /* child watcher */ 1314 ev_ref (EV_A); /* child watcher */
1236 ev_signal_stop (EV_A_ &childev); 1315 ev_signal_stop (EV_A_ &childev);
1237#endif 1316#endif
1238 1317
1239 ev_ref (EV_A); /* signal watcher */
1240 ev_io_stop (EV_A_ &sigev);
1241
1242 close (sigpipe [0]); sigpipe [0] = 0;
1243 close (sigpipe [1]); sigpipe [1] = 0;
1244
1245 loop_destroy (EV_A); 1318 loop_destroy (EV_A);
1246} 1319}
1247 1320
1248void 1321void
1249ev_default_fork (void) 1322ev_default_fork (void)
… …
1251#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1252 struct ev_loop *loop = ev_default_loop_ptr; 1325 struct ev_loop *loop = ev_default_loop_ptr;
1253#endif 1326#endif
1254 1327
1255 if (backend) 1328 if (backend)
1256 postfork = 1; 1329 postfork = 1; /* must be in line with ev_loop_fork */
1257} 1330}
1258 1331
1259/*****************************************************************************/ 1332/*****************************************************************************/
1260 1333
1261void 1334void
… …
1835#endif 1908#endif
1836 if (expect_false (ev_is_active (w))) 1909 if (expect_false (ev_is_active (w)))
1837 return; 1910 return;
1838 1911
1839 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1912 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1913
1914 evpipe_init (EV_A);
1840 1915
1841 { 1916 {
1842#ifndef _WIN32 1917#ifndef _WIN32
1843 sigset_t full, prev; 1918 sigset_t full, prev;
1844 sigfillset (&full); 1919 sigfillset (&full);
… …
2264 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2339 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2265 2340
2266 if (ev_cb (w)) 2341 if (ev_cb (w))
2267 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2342 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2268 else 2343 else
2269 ev_embed_sweep (loop, w); 2344 ev_loop (w->other, EVLOOP_NONBLOCK);
2270} 2345}
2271 2346
2272static void 2347static void
2273embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 2348embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2274{ 2349{
2275 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 2350 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2276 2351
2277 fd_reify (w->other); 2352 {
2353 struct ev_loop *loop = w->other;
2354
2355 while (fdchangecnt)
2356 {
2357 fd_reify (EV_A);
2358 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2359 }
2360 }
2278} 2361}
2362
2363#if 0
2364static void
2365embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2366{
2367 ev_idle_stop (EV_A_ idle);
2368}
2369#endif
2279 2370
2280void 2371void
2281ev_embed_start (EV_P_ ev_embed *w) 2372ev_embed_start (EV_P_ ev_embed *w)
2282{ 2373{
2283 if (expect_false (ev_is_active (w))) 2374 if (expect_false (ev_is_active (w)))
… …
2294 2385
2295 ev_prepare_init (&w->prepare, embed_prepare_cb); 2386 ev_prepare_init (&w->prepare, embed_prepare_cb);
2296 ev_set_priority (&w->prepare, EV_MINPRI); 2387 ev_set_priority (&w->prepare, EV_MINPRI);
2297 ev_prepare_start (EV_A_ &w->prepare); 2388 ev_prepare_start (EV_A_ &w->prepare);
2298 2389
2390 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2391
2299 ev_start (EV_A_ (W)w, 1); 2392 ev_start (EV_A_ (W)w, 1);
2300} 2393}
2301 2394
2302void 2395void
2303ev_embed_stop (EV_P_ ev_embed *w) 2396ev_embed_stop (EV_P_ ev_embed *w)
… …
2340 2433
2341 ev_stop (EV_A_ (W)w); 2434 ev_stop (EV_A_ (W)w);
2342} 2435}
2343#endif 2436#endif
2344 2437
2438#if EV_ASYNC_ENABLE
2439void
2440ev_async_start (EV_P_ ev_async *w)
2441{
2442 if (expect_false (ev_is_active (w)))
2443 return;
2444
2445 evpipe_init (EV_A);
2446
2447 ev_start (EV_A_ (W)w, ++asynccnt);
2448 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2449 asyncs [asynccnt - 1] = w;
2450}
2451
2452void
2453ev_async_stop (EV_P_ ev_async *w)
2454{
2455 clear_pending (EV_A_ (W)w);
2456 if (expect_false (!ev_is_active (w)))
2457 return;
2458
2459 {
2460 int active = ((W)w)->active;
2461 asyncs [active - 1] = asyncs [--asynccnt];
2462 ((W)asyncs [active - 1])->active = active;
2463 }
2464
2465 ev_stop (EV_A_ (W)w);
2466}
2467
2468void
2469ev_async_send (EV_P_ ev_async *w)
2470{
2471 w->sent = 1;
2472 evpipe_write (EV_A_ 0, 1);
2473}
2474#endif
2475
2345/*****************************************************************************/ 2476/*****************************************************************************/
2346 2477
2347struct ev_once 2478struct ev_once
2348{ 2479{
2349 ev_io io; 2480 ev_io io;

Diff Legend

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