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

Comparing libev/ev.c (file contents):
Revision 1.81 by root, Fri Nov 9 17:07:59 2007 UTC vs.
Revision 1.95 by root, Sun Nov 11 01:42:13 2007 UTC

… …
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 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. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
32# include "config.h" 37# include "config.h"
33 38
34# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
35# define EV_USE_MONOTONIC 1 40# define EV_USE_MONOTONIC 1
… …
46 51
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 52# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1 53# define EV_USE_EPOLL 1
49# endif 54# endif
50 55
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 56# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1 57# define EV_USE_KQUEUE 1
53# endif 58# endif
54 59
55#endif 60#endif
56 61
… …
221 226
222#if EV_MULTIPLICITY 227#if EV_MULTIPLICITY
223 228
224 struct ev_loop 229 struct ev_loop
225 { 230 {
231 ev_tstamp ev_rt_now;
226 #define VAR(name,decl) decl; 232 #define VAR(name,decl) decl;
227 #include "ev_vars.h" 233 #include "ev_vars.h"
228 #undef VAR 234 #undef VAR
229 }; 235 };
230 #include "ev_wrap.h" 236 #include "ev_wrap.h"
… …
232 struct ev_loop default_loop_struct; 238 struct ev_loop default_loop_struct;
233 static struct ev_loop *default_loop; 239 static struct ev_loop *default_loop;
234 240
235#else 241#else
236 242
243 ev_tstamp ev_rt_now;
237 #define VAR(name,decl) static decl; 244 #define VAR(name,decl) static decl;
238 #include "ev_vars.h" 245 #include "ev_vars.h"
239 #undef VAR 246 #undef VAR
240 247
241 static int default_loop; 248 static int default_loop;
242 249
243#endif 250#endif
244 251
245/*****************************************************************************/ 252/*****************************************************************************/
246 253
247inline ev_tstamp 254ev_tstamp
248ev_time (void) 255ev_time (void)
249{ 256{
250#if EV_USE_REALTIME 257#if EV_USE_REALTIME
251 struct timespec ts; 258 struct timespec ts;
252 clock_gettime (CLOCK_REALTIME, &ts); 259 clock_gettime (CLOCK_REALTIME, &ts);
… …
271#endif 278#endif
272 279
273 return ev_time (); 280 return ev_time ();
274} 281}
275 282
283#if EV_MULTIPLICITY
276ev_tstamp 284ev_tstamp
277ev_now (EV_P) 285ev_now (EV_P)
278{ 286{
279 return rt_now; 287 return ev_rt_now;
280} 288}
289#endif
281 290
282#define array_roundsize(type,n) ((n) | 4 & ~3) 291#define array_roundsize(type,n) ((n) | 4 & ~3)
283 292
284#define array_needsize(type,base,cur,cnt,init) \ 293#define array_needsize(type,base,cur,cnt,init) \
285 if (expect_false ((cnt) > cur)) \ 294 if (expect_false ((cnt) > cur)) \
… …
518 527
519 heap [k] = w; 528 heap [k] = w;
520 ((W)heap [k])->active = k + 1; 529 ((W)heap [k])->active = k + 1;
521} 530}
522 531
532inline void
533adjustheap (WT *heap, int N, int k, ev_tstamp at)
534{
535 ev_tstamp old_at = heap [k]->at;
536 heap [k]->at = at;
537
538 if (old_at < at)
539 downheap (heap, N, k);
540 else
541 upheap (heap, k);
542}
543
523/*****************************************************************************/ 544/*****************************************************************************/
524 545
525typedef struct 546typedef struct
526{ 547{
527 WL head; 548 WL head;
… …
723 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 744 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
724 have_monotonic = 1; 745 have_monotonic = 1;
725 } 746 }
726#endif 747#endif
727 748
728 rt_now = ev_time (); 749 ev_rt_now = ev_time ();
729 mn_now = get_clock (); 750 mn_now = get_clock ();
730 now_floor = mn_now; 751 now_floor = mn_now;
731 rtmn_diff = rt_now - mn_now; 752 rtmn_diff = ev_rt_now - mn_now;
732 753
733 if (methods == EVMETHOD_AUTO) 754 if (methods == EVMETHOD_AUTO)
734 if (!enable_secure () && getenv ("LIBEV_METHODS")) 755 if (!enable_secure () && getenv ("LIBEV_METHODS"))
735 methods = atoi (getenv ("LIBEV_METHODS")); 756 methods = atoi (getenv ("LIBEV_METHODS"));
736 else 757 else
… …
751#endif 772#endif
752#if EV_USE_SELECT 773#if EV_USE_SELECT
753 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 774 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
754#endif 775#endif
755 776
756 ev_watcher_init (&sigev, sigcb); 777 ev_init (&sigev, sigcb);
757 ev_set_priority (&sigev, EV_MAXPRI); 778 ev_set_priority (&sigev, EV_MAXPRI);
758 } 779 }
759} 780}
760 781
761void 782void
… …
783 array_free (pending, [i]); 804 array_free (pending, [i]);
784 805
785 /* have to use the microsoft-never-gets-it-right macro */ 806 /* have to use the microsoft-never-gets-it-right macro */
786 array_free_microshit (fdchange); 807 array_free_microshit (fdchange);
787 array_free_microshit (timer); 808 array_free_microshit (timer);
809#if EV_PERIODICS
788 array_free_microshit (periodic); 810 array_free_microshit (periodic);
811#endif
789 array_free_microshit (idle); 812 array_free_microshit (idle);
790 array_free_microshit (prepare); 813 array_free_microshit (prepare);
791 array_free_microshit (check); 814 array_free_microshit (check);
792 815
793 method = 0; 816 method = 0;
… …
948 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 971 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
949 972
950 if (p->w) 973 if (p->w)
951 { 974 {
952 p->w->pending = 0; 975 p->w->pending = 0;
953 p->w->cb (EV_A_ p->w, p->events); 976 EV_CB_INVOKE (p->w, p->events);
954 } 977 }
955 } 978 }
956} 979}
957 980
958static void 981static void
… …
966 989
967 /* first reschedule or stop timer */ 990 /* first reschedule or stop timer */
968 if (w->repeat) 991 if (w->repeat)
969 { 992 {
970 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 993 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
994
971 ((WT)w)->at = mn_now + w->repeat; 995 ((WT)w)->at += w->repeat;
996 if (((WT)w)->at < mn_now)
997 ((WT)w)->at = mn_now;
998
972 downheap ((WT *)timers, timercnt, 0); 999 downheap ((WT *)timers, timercnt, 0);
973 } 1000 }
974 else 1001 else
975 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1002 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
976 1003
977 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1004 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
978 } 1005 }
979} 1006}
980 1007
1008#if EV_PERIODICS
981static void 1009static void
982periodics_reify (EV_P) 1010periodics_reify (EV_P)
983{ 1011{
984 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1012 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
985 { 1013 {
986 struct ev_periodic *w = periodics [0]; 1014 struct ev_periodic *w = periodics [0];
987 1015
988 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1016 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
989 1017
990 /* first reschedule or stop timer */ 1018 /* first reschedule or stop timer */
991 if (w->reschedule_cb) 1019 if (w->reschedule_cb)
992 { 1020 {
993 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1021 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
994 1022
995 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1023 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
996 downheap ((WT *)periodics, periodiccnt, 0); 1024 downheap ((WT *)periodics, periodiccnt, 0);
997 } 1025 }
998 else if (w->interval) 1026 else if (w->interval)
999 { 1027 {
1000 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1028 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
1001 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1029 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1002 downheap ((WT *)periodics, periodiccnt, 0); 1030 downheap ((WT *)periodics, periodiccnt, 0);
1003 } 1031 }
1004 else 1032 else
1005 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1033 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1006 1034
… …
1017 for (i = 0; i < periodiccnt; ++i) 1045 for (i = 0; i < periodiccnt; ++i)
1018 { 1046 {
1019 struct ev_periodic *w = periodics [i]; 1047 struct ev_periodic *w = periodics [i];
1020 1048
1021 if (w->reschedule_cb) 1049 if (w->reschedule_cb)
1022 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1050 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1023 else if (w->interval) 1051 else if (w->interval)
1024 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1052 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1025 } 1053 }
1026 1054
1027 /* now rebuild the heap */ 1055 /* now rebuild the heap */
1028 for (i = periodiccnt >> 1; i--; ) 1056 for (i = periodiccnt >> 1; i--; )
1029 downheap ((WT *)periodics, periodiccnt, i); 1057 downheap ((WT *)periodics, periodiccnt, i);
1030} 1058}
1059#endif
1031 1060
1032inline int 1061inline int
1033time_update_monotonic (EV_P) 1062time_update_monotonic (EV_P)
1034{ 1063{
1035 mn_now = get_clock (); 1064 mn_now = get_clock ();
1036 1065
1037 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1066 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1038 { 1067 {
1039 rt_now = rtmn_diff + mn_now; 1068 ev_rt_now = rtmn_diff + mn_now;
1040 return 0; 1069 return 0;
1041 } 1070 }
1042 else 1071 else
1043 { 1072 {
1044 now_floor = mn_now; 1073 now_floor = mn_now;
1045 rt_now = ev_time (); 1074 ev_rt_now = ev_time ();
1046 return 1; 1075 return 1;
1047 } 1076 }
1048} 1077}
1049 1078
1050static void 1079static void
… …
1059 { 1088 {
1060 ev_tstamp odiff = rtmn_diff; 1089 ev_tstamp odiff = rtmn_diff;
1061 1090
1062 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1091 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1063 { 1092 {
1064 rtmn_diff = rt_now - mn_now; 1093 rtmn_diff = ev_rt_now - mn_now;
1065 1094
1066 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1095 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1067 return; /* all is well */ 1096 return; /* all is well */
1068 1097
1069 rt_now = ev_time (); 1098 ev_rt_now = ev_time ();
1070 mn_now = get_clock (); 1099 mn_now = get_clock ();
1071 now_floor = mn_now; 1100 now_floor = mn_now;
1072 } 1101 }
1073 1102
1103# if EV_PERIODICS
1074 periodics_reschedule (EV_A); 1104 periodics_reschedule (EV_A);
1105# endif
1075 /* no timer adjustment, as the monotonic clock doesn't jump */ 1106 /* no timer adjustment, as the monotonic clock doesn't jump */
1076 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1107 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1077 } 1108 }
1078 } 1109 }
1079 else 1110 else
1080#endif 1111#endif
1081 { 1112 {
1082 rt_now = ev_time (); 1113 ev_rt_now = ev_time ();
1083 1114
1084 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1115 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1085 { 1116 {
1117#if EV_PERIODICS
1086 periodics_reschedule (EV_A); 1118 periodics_reschedule (EV_A);
1119#endif
1087 1120
1088 /* adjust timers. this is easy, as the offset is the same for all */ 1121 /* adjust timers. this is easy, as the offset is the same for all */
1089 for (i = 0; i < timercnt; ++i) 1122 for (i = 0; i < timercnt; ++i)
1090 ((WT)timers [i])->at += rt_now - mn_now; 1123 ((WT)timers [i])->at += ev_rt_now - mn_now;
1091 } 1124 }
1092 1125
1093 mn_now = rt_now; 1126 mn_now = ev_rt_now;
1094 } 1127 }
1095} 1128}
1096 1129
1097void 1130void
1098ev_ref (EV_P) 1131ev_ref (EV_P)
… …
1138 if (expect_true (have_monotonic)) 1171 if (expect_true (have_monotonic))
1139 time_update_monotonic (EV_A); 1172 time_update_monotonic (EV_A);
1140 else 1173 else
1141#endif 1174#endif
1142 { 1175 {
1143 rt_now = ev_time (); 1176 ev_rt_now = ev_time ();
1144 mn_now = rt_now; 1177 mn_now = ev_rt_now;
1145 } 1178 }
1146 1179
1147 if (flags & EVLOOP_NONBLOCK || idlecnt) 1180 if (flags & EVLOOP_NONBLOCK || idlecnt)
1148 block = 0.; 1181 block = 0.;
1149 else 1182 else
… …
1154 { 1187 {
1155 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1188 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1156 if (block > to) block = to; 1189 if (block > to) block = to;
1157 } 1190 }
1158 1191
1192#if EV_PERIODICS
1159 if (periodiccnt) 1193 if (periodiccnt)
1160 { 1194 {
1161 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1195 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1162 if (block > to) block = to; 1196 if (block > to) block = to;
1163 } 1197 }
1198#endif
1164 1199
1165 if (block < 0.) block = 0.; 1200 if (block < 0.) block = 0.;
1166 } 1201 }
1167 1202
1168 method_poll (EV_A_ block); 1203 method_poll (EV_A_ block);
1169 1204
1170 /* update rt_now, do magic */ 1205 /* update ev_rt_now, do magic */
1171 time_update (EV_A); 1206 time_update (EV_A);
1172 1207
1173 /* queue pending timers and reschedule them */ 1208 /* queue pending timers and reschedule them */
1174 timers_reify (EV_A); /* relative timers called last */ 1209 timers_reify (EV_A); /* relative timers called last */
1210#if EV_PERIODICS
1175 periodics_reify (EV_A); /* absolute timers called first */ 1211 periodics_reify (EV_A); /* absolute timers called first */
1212#endif
1176 1213
1177 /* queue idle watchers unless io or timers are pending */ 1214 /* queue idle watchers unless io or timers are pending */
1178 if (idlecnt && !any_pending (EV_A)) 1215 if (idlecnt && !any_pending (EV_A))
1179 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1216 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1180 1217
… …
1271{ 1308{
1272 ev_clear_pending (EV_A_ (W)w); 1309 ev_clear_pending (EV_A_ (W)w);
1273 if (!ev_is_active (w)) 1310 if (!ev_is_active (w))
1274 return; 1311 return;
1275 1312
1313 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1314
1276 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1315 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1277 ev_stop (EV_A_ (W)w); 1316 ev_stop (EV_A_ (W)w);
1278 1317
1279 fd_change (EV_A_ w->fd); 1318 fd_change (EV_A_ w->fd);
1280} 1319}
… …
1310 { 1349 {
1311 timers [((W)w)->active - 1] = timers [timercnt]; 1350 timers [((W)w)->active - 1] = timers [timercnt];
1312 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1351 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1313 } 1352 }
1314 1353
1315 ((WT)w)->at = w->repeat; 1354 ((WT)w)->at -= mn_now;
1316 1355
1317 ev_stop (EV_A_ (W)w); 1356 ev_stop (EV_A_ (W)w);
1318} 1357}
1319 1358
1320void 1359void
1321ev_timer_again (EV_P_ struct ev_timer *w) 1360ev_timer_again (EV_P_ struct ev_timer *w)
1322{ 1361{
1323 if (ev_is_active (w)) 1362 if (ev_is_active (w))
1324 { 1363 {
1325 if (w->repeat) 1364 if (w->repeat)
1326 {
1327 ((WT)w)->at = mn_now + w->repeat;
1328 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1365 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat);
1329 }
1330 else 1366 else
1331 ev_timer_stop (EV_A_ w); 1367 ev_timer_stop (EV_A_ w);
1332 } 1368 }
1333 else if (w->repeat) 1369 else if (w->repeat)
1334 ev_timer_start (EV_A_ w); 1370 ev_timer_start (EV_A_ w);
1335} 1371}
1336 1372
1373#if EV_PERIODICS
1337void 1374void
1338ev_periodic_start (EV_P_ struct ev_periodic *w) 1375ev_periodic_start (EV_P_ struct ev_periodic *w)
1339{ 1376{
1340 if (ev_is_active (w)) 1377 if (ev_is_active (w))
1341 return; 1378 return;
1342 1379
1343 if (w->reschedule_cb) 1380 if (w->reschedule_cb)
1344 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1381 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1345 else if (w->interval) 1382 else if (w->interval)
1346 { 1383 {
1347 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1384 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1348 /* this formula differs from the one in periodic_reify because we do not always round up */ 1385 /* this formula differs from the one in periodic_reify because we do not always round up */
1349 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1386 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1350 } 1387 }
1351 1388
1352 ev_start (EV_A_ (W)w, ++periodiccnt); 1389 ev_start (EV_A_ (W)w, ++periodiccnt);
1353 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1390 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1354 periodics [periodiccnt - 1] = w; 1391 periodics [periodiccnt - 1] = w;
… …
1376} 1413}
1377 1414
1378void 1415void
1379ev_periodic_again (EV_P_ struct ev_periodic *w) 1416ev_periodic_again (EV_P_ struct ev_periodic *w)
1380{ 1417{
1418 /* TODO: use adjustheap and recalculation */
1381 ev_periodic_stop (EV_A_ w); 1419 ev_periodic_stop (EV_A_ w);
1382 ev_periodic_start (EV_A_ w); 1420 ev_periodic_start (EV_A_ w);
1383} 1421}
1422#endif
1384 1423
1385void 1424void
1386ev_idle_start (EV_P_ struct ev_idle *w) 1425ev_idle_start (EV_P_ struct ev_idle *w)
1387{ 1426{
1388 if (ev_is_active (w)) 1427 if (ev_is_active (w))
… …
1439 1478
1440void 1479void
1441ev_check_stop (EV_P_ struct ev_check *w) 1480ev_check_stop (EV_P_ struct ev_check *w)
1442{ 1481{
1443 ev_clear_pending (EV_A_ (W)w); 1482 ev_clear_pending (EV_A_ (W)w);
1444 if (ev_is_active (w)) 1483 if (!ev_is_active (w))
1445 return; 1484 return;
1446 1485
1447 checks [((W)w)->active - 1] = checks [--checkcnt]; 1486 checks [((W)w)->active - 1] = checks [--checkcnt];
1448 ev_stop (EV_A_ (W)w); 1487 ev_stop (EV_A_ (W)w);
1449} 1488}
… …
1510 1549
1511void 1550void
1512ev_child_stop (EV_P_ struct ev_child *w) 1551ev_child_stop (EV_P_ struct ev_child *w)
1513{ 1552{
1514 ev_clear_pending (EV_A_ (W)w); 1553 ev_clear_pending (EV_A_ (W)w);
1515 if (ev_is_active (w)) 1554 if (!ev_is_active (w))
1516 return; 1555 return;
1517 1556
1518 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1557 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1519 ev_stop (EV_A_ (W)w); 1558 ev_stop (EV_A_ (W)w);
1520} 1559}
… …
1564 else 1603 else
1565 { 1604 {
1566 once->cb = cb; 1605 once->cb = cb;
1567 once->arg = arg; 1606 once->arg = arg;
1568 1607
1569 ev_watcher_init (&once->io, once_cb_io); 1608 ev_init (&once->io, once_cb_io);
1570 if (fd >= 0) 1609 if (fd >= 0)
1571 { 1610 {
1572 ev_io_set (&once->io, fd, events); 1611 ev_io_set (&once->io, fd, events);
1573 ev_io_start (EV_A_ &once->io); 1612 ev_io_start (EV_A_ &once->io);
1574 } 1613 }
1575 1614
1576 ev_watcher_init (&once->to, once_cb_to); 1615 ev_init (&once->to, once_cb_to);
1577 if (timeout >= 0.) 1616 if (timeout >= 0.)
1578 { 1617 {
1579 ev_timer_set (&once->to, timeout, 0.); 1618 ev_timer_set (&once->to, timeout, 0.);
1580 ev_timer_start (EV_A_ &once->to); 1619 ev_timer_start (EV_A_ &once->to);
1581 } 1620 }
1582 } 1621 }
1583} 1622}
1584 1623
1624#ifdef __cplusplus
1625}
1626#endif
1627

Diff Legend

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