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

Comparing libev/ev.c (file contents):
Revision 1.80 by root, Fri Nov 9 15:30:59 2007 UTC vs.
Revision 1.97 by root, Sun Nov 11 01:53:07 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
40# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif
43# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif
37# endif 46# endif
38 47
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
40# define EV_USE_SELECT 1 49# define EV_USE_SELECT 1
41# endif 50# endif
42 51
43# if HAVE_POLL && HAVE_POLL_H 52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
44# define EV_USE_POLL 1 53# define EV_USE_POLL 1
45# endif 54# endif
46 55
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 56# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
48# define EV_USE_EPOLL 1 57# define EV_USE_EPOLL 1
49# endif 58# endif
50 59
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
52# define EV_USE_KQUEUE 1 61# define EV_USE_KQUEUE 1
53# endif 62# endif
54 63
55#endif 64#endif
56 65
… …
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 135#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
127#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 136#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
128#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 137#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
129/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 138/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
130 139
140#ifdef EV_H
141# include EV_H
142#else
131#include "ev.h" 143# include "ev.h"
144#endif
132 145
133#if __GNUC__ >= 3 146#if __GNUC__ >= 3
134# define expect(expr,value) __builtin_expect ((expr),(value)) 147# define expect(expr,value) __builtin_expect ((expr),(value))
135# define inline inline 148# define inline inline
136#else 149#else
… …
217 230
218#if EV_MULTIPLICITY 231#if EV_MULTIPLICITY
219 232
220 struct ev_loop 233 struct ev_loop
221 { 234 {
235 ev_tstamp ev_rt_now;
222 #define VAR(name,decl) decl; 236 #define VAR(name,decl) decl;
223 #include "ev_vars.h" 237 #include "ev_vars.h"
224 #undef VAR 238 #undef VAR
225 }; 239 };
226 #include "ev_wrap.h" 240 #include "ev_wrap.h"
… …
228 struct ev_loop default_loop_struct; 242 struct ev_loop default_loop_struct;
229 static struct ev_loop *default_loop; 243 static struct ev_loop *default_loop;
230 244
231#else 245#else
232 246
247 ev_tstamp ev_rt_now;
233 #define VAR(name,decl) static decl; 248 #define VAR(name,decl) static decl;
234 #include "ev_vars.h" 249 #include "ev_vars.h"
235 #undef VAR 250 #undef VAR
236 251
237 static int default_loop; 252 static int default_loop;
238 253
239#endif 254#endif
240 255
241/*****************************************************************************/ 256/*****************************************************************************/
242 257
243inline ev_tstamp 258ev_tstamp
244ev_time (void) 259ev_time (void)
245{ 260{
246#if EV_USE_REALTIME 261#if EV_USE_REALTIME
247 struct timespec ts; 262 struct timespec ts;
248 clock_gettime (CLOCK_REALTIME, &ts); 263 clock_gettime (CLOCK_REALTIME, &ts);
… …
267#endif 282#endif
268 283
269 return ev_time (); 284 return ev_time ();
270} 285}
271 286
287#if EV_MULTIPLICITY
272ev_tstamp 288ev_tstamp
273ev_now (EV_P) 289ev_now (EV_P)
274{ 290{
275 return rt_now; 291 return ev_rt_now;
276} 292}
293#endif
277 294
278#define array_roundsize(type,n) ((n) | 4 & ~3) 295#define array_roundsize(type,n) ((n) | 4 & ~3)
279 296
280#define array_needsize(type,base,cur,cnt,init) \ 297#define array_needsize(type,base,cur,cnt,init) \
281 if (expect_false ((cnt) > cur)) \ 298 if (expect_false ((cnt) > cur)) \
… …
514 531
515 heap [k] = w; 532 heap [k] = w;
516 ((W)heap [k])->active = k + 1; 533 ((W)heap [k])->active = k + 1;
517} 534}
518 535
536inline void
537adjustheap (WT *heap, int N, int k, ev_tstamp at)
538{
539 ev_tstamp old_at = heap [k]->at;
540 heap [k]->at = at;
541
542 if (old_at < at)
543 downheap (heap, N, k);
544 else
545 upheap (heap, k);
546}
547
519/*****************************************************************************/ 548/*****************************************************************************/
520 549
521typedef struct 550typedef struct
522{ 551{
523 WL head; 552 WL head;
… …
719 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 748 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
720 have_monotonic = 1; 749 have_monotonic = 1;
721 } 750 }
722#endif 751#endif
723 752
724 rt_now = ev_time (); 753 ev_rt_now = ev_time ();
725 mn_now = get_clock (); 754 mn_now = get_clock ();
726 now_floor = mn_now; 755 now_floor = mn_now;
727 rtmn_diff = rt_now - mn_now; 756 rtmn_diff = ev_rt_now - mn_now;
728 757
729 if (methods == EVMETHOD_AUTO) 758 if (methods == EVMETHOD_AUTO)
730 if (!enable_secure () && getenv ("LIBEV_METHODS")) 759 if (!enable_secure () && getenv ("LIBEV_METHODS"))
731 methods = atoi (getenv ("LIBEV_METHODS")); 760 methods = atoi (getenv ("LIBEV_METHODS"));
732 else 761 else
… …
747#endif 776#endif
748#if EV_USE_SELECT 777#if EV_USE_SELECT
749 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 778 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
750#endif 779#endif
751 780
752 ev_watcher_init (&sigev, sigcb); 781 ev_init (&sigev, sigcb);
753 ev_set_priority (&sigev, EV_MAXPRI); 782 ev_set_priority (&sigev, EV_MAXPRI);
754 } 783 }
755} 784}
756 785
757void 786void
… …
779 array_free (pending, [i]); 808 array_free (pending, [i]);
780 809
781 /* have to use the microsoft-never-gets-it-right macro */ 810 /* have to use the microsoft-never-gets-it-right macro */
782 array_free_microshit (fdchange); 811 array_free_microshit (fdchange);
783 array_free_microshit (timer); 812 array_free_microshit (timer);
813#if EV_PERIODICS
784 array_free_microshit (periodic); 814 array_free_microshit (periodic);
815#endif
785 array_free_microshit (idle); 816 array_free_microshit (idle);
786 array_free_microshit (prepare); 817 array_free_microshit (prepare);
787 array_free_microshit (check); 818 array_free_microshit (check);
788 819
789 method = 0; 820 method = 0;
… …
944 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 975 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
945 976
946 if (p->w) 977 if (p->w)
947 { 978 {
948 p->w->pending = 0; 979 p->w->pending = 0;
949 p->w->cb (EV_A_ p->w, p->events); 980 EV_CB_INVOKE (p->w, p->events);
950 } 981 }
951 } 982 }
952} 983}
953 984
954static void 985static void
… …
962 993
963 /* first reschedule or stop timer */ 994 /* first reschedule or stop timer */
964 if (w->repeat) 995 if (w->repeat)
965 { 996 {
966 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 997 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
998
967 ((WT)w)->at = mn_now + w->repeat; 999 ((WT)w)->at += w->repeat;
1000 if (((WT)w)->at < mn_now)
1001 ((WT)w)->at = mn_now;
1002
968 downheap ((WT *)timers, timercnt, 0); 1003 downheap ((WT *)timers, timercnt, 0);
969 } 1004 }
970 else 1005 else
971 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1006 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
972 1007
973 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1008 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
974 } 1009 }
975} 1010}
976 1011
1012#if EV_PERIODICS
977static void 1013static void
978periodics_reify (EV_P) 1014periodics_reify (EV_P)
979{ 1015{
980 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1016 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
981 { 1017 {
982 struct ev_periodic *w = periodics [0]; 1018 struct ev_periodic *w = periodics [0];
983 1019
984 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1020 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
985 1021
986 /* first reschedule or stop timer */ 1022 /* first reschedule or stop timer */
987 if (w->reschedule_cb) 1023 if (w->reschedule_cb)
988 { 1024 {
989 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1025 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
990 1026
991 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1027 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
992 downheap ((WT *)periodics, periodiccnt, 0); 1028 downheap ((WT *)periodics, periodiccnt, 0);
993 } 1029 }
994 else if (w->interval) 1030 else if (w->interval)
995 { 1031 {
996 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1032 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
997 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1033 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
998 downheap ((WT *)periodics, periodiccnt, 0); 1034 downheap ((WT *)periodics, periodiccnt, 0);
999 } 1035 }
1000 else 1036 else
1001 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1037 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1002 1038
… …
1013 for (i = 0; i < periodiccnt; ++i) 1049 for (i = 0; i < periodiccnt; ++i)
1014 { 1050 {
1015 struct ev_periodic *w = periodics [i]; 1051 struct ev_periodic *w = periodics [i];
1016 1052
1017 if (w->reschedule_cb) 1053 if (w->reschedule_cb)
1018 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1054 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1019 else if (w->interval) 1055 else if (w->interval)
1020 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1056 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1021 } 1057 }
1022 1058
1023 /* now rebuild the heap */ 1059 /* now rebuild the heap */
1024 for (i = periodiccnt >> 1; i--; ) 1060 for (i = periodiccnt >> 1; i--; )
1025 downheap ((WT *)periodics, periodiccnt, i); 1061 downheap ((WT *)periodics, periodiccnt, i);
1026} 1062}
1063#endif
1027 1064
1028inline int 1065inline int
1029time_update_monotonic (EV_P) 1066time_update_monotonic (EV_P)
1030{ 1067{
1031 mn_now = get_clock (); 1068 mn_now = get_clock ();
1032 1069
1033 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1070 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1034 { 1071 {
1035 rt_now = rtmn_diff + mn_now; 1072 ev_rt_now = rtmn_diff + mn_now;
1036 return 0; 1073 return 0;
1037 } 1074 }
1038 else 1075 else
1039 { 1076 {
1040 now_floor = mn_now; 1077 now_floor = mn_now;
1041 rt_now = ev_time (); 1078 ev_rt_now = ev_time ();
1042 return 1; 1079 return 1;
1043 } 1080 }
1044} 1081}
1045 1082
1046static void 1083static void
… …
1055 { 1092 {
1056 ev_tstamp odiff = rtmn_diff; 1093 ev_tstamp odiff = rtmn_diff;
1057 1094
1058 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1095 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1059 { 1096 {
1060 rtmn_diff = rt_now - mn_now; 1097 rtmn_diff = ev_rt_now - mn_now;
1061 1098
1062 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1099 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1063 return; /* all is well */ 1100 return; /* all is well */
1064 1101
1065 rt_now = ev_time (); 1102 ev_rt_now = ev_time ();
1066 mn_now = get_clock (); 1103 mn_now = get_clock ();
1067 now_floor = mn_now; 1104 now_floor = mn_now;
1068 } 1105 }
1069 1106
1107# if EV_PERIODICS
1070 periodics_reschedule (EV_A); 1108 periodics_reschedule (EV_A);
1109# endif
1071 /* no timer adjustment, as the monotonic clock doesn't jump */ 1110 /* no timer adjustment, as the monotonic clock doesn't jump */
1072 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1111 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1073 } 1112 }
1074 } 1113 }
1075 else 1114 else
1076#endif 1115#endif
1077 { 1116 {
1078 rt_now = ev_time (); 1117 ev_rt_now = ev_time ();
1079 1118
1080 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1119 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1081 { 1120 {
1121#if EV_PERIODICS
1082 periodics_reschedule (EV_A); 1122 periodics_reschedule (EV_A);
1123#endif
1083 1124
1084 /* adjust timers. this is easy, as the offset is the same for all */ 1125 /* adjust timers. this is easy, as the offset is the same for all */
1085 for (i = 0; i < timercnt; ++i) 1126 for (i = 0; i < timercnt; ++i)
1086 ((WT)timers [i])->at += rt_now - mn_now; 1127 ((WT)timers [i])->at += ev_rt_now - mn_now;
1087 } 1128 }
1088 1129
1089 mn_now = rt_now; 1130 mn_now = ev_rt_now;
1090 } 1131 }
1091} 1132}
1092 1133
1093void 1134void
1094ev_ref (EV_P) 1135ev_ref (EV_P)
… …
1134 if (expect_true (have_monotonic)) 1175 if (expect_true (have_monotonic))
1135 time_update_monotonic (EV_A); 1176 time_update_monotonic (EV_A);
1136 else 1177 else
1137#endif 1178#endif
1138 { 1179 {
1139 rt_now = ev_time (); 1180 ev_rt_now = ev_time ();
1140 mn_now = rt_now; 1181 mn_now = ev_rt_now;
1141 } 1182 }
1142 1183
1143 if (flags & EVLOOP_NONBLOCK || idlecnt) 1184 if (flags & EVLOOP_NONBLOCK || idlecnt)
1144 block = 0.; 1185 block = 0.;
1145 else 1186 else
… …
1150 { 1191 {
1151 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1192 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1152 if (block > to) block = to; 1193 if (block > to) block = to;
1153 } 1194 }
1154 1195
1196#if EV_PERIODICS
1155 if (periodiccnt) 1197 if (periodiccnt)
1156 { 1198 {
1157 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1199 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1158 if (block > to) block = to; 1200 if (block > to) block = to;
1159 } 1201 }
1202#endif
1160 1203
1161 if (block < 0.) block = 0.; 1204 if (block < 0.) block = 0.;
1162 } 1205 }
1163 1206
1164 method_poll (EV_A_ block); 1207 method_poll (EV_A_ block);
1165 1208
1166 /* update rt_now, do magic */ 1209 /* update ev_rt_now, do magic */
1167 time_update (EV_A); 1210 time_update (EV_A);
1168 1211
1169 /* queue pending timers and reschedule them */ 1212 /* queue pending timers and reschedule them */
1170 timers_reify (EV_A); /* relative timers called last */ 1213 timers_reify (EV_A); /* relative timers called last */
1214#if EV_PERIODICS
1171 periodics_reify (EV_A); /* absolute timers called first */ 1215 periodics_reify (EV_A); /* absolute timers called first */
1216#endif
1172 1217
1173 /* queue idle watchers unless io or timers are pending */ 1218 /* queue idle watchers unless io or timers are pending */
1174 if (idlecnt && !any_pending (EV_A)) 1219 if (idlecnt && !any_pending (EV_A))
1175 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1220 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1176 1221
… …
1267{ 1312{
1268 ev_clear_pending (EV_A_ (W)w); 1313 ev_clear_pending (EV_A_ (W)w);
1269 if (!ev_is_active (w)) 1314 if (!ev_is_active (w))
1270 return; 1315 return;
1271 1316
1317 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1318
1272 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1319 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1273 ev_stop (EV_A_ (W)w); 1320 ev_stop (EV_A_ (W)w);
1274 1321
1275 fd_change (EV_A_ w->fd); 1322 fd_change (EV_A_ w->fd);
1276} 1323}
… …
1306 { 1353 {
1307 timers [((W)w)->active - 1] = timers [timercnt]; 1354 timers [((W)w)->active - 1] = timers [timercnt];
1308 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1355 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1309 } 1356 }
1310 1357
1311 ((WT)w)->at = w->repeat; 1358 ((WT)w)->at -= mn_now;
1312 1359
1313 ev_stop (EV_A_ (W)w); 1360 ev_stop (EV_A_ (W)w);
1314} 1361}
1315 1362
1316void 1363void
1317ev_timer_again (EV_P_ struct ev_timer *w) 1364ev_timer_again (EV_P_ struct ev_timer *w)
1318{ 1365{
1319 if (ev_is_active (w)) 1366 if (ev_is_active (w))
1320 { 1367 {
1321 if (w->repeat) 1368 if (w->repeat)
1322 {
1323 ((WT)w)->at = mn_now + w->repeat;
1324 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1369 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat);
1325 }
1326 else 1370 else
1327 ev_timer_stop (EV_A_ w); 1371 ev_timer_stop (EV_A_ w);
1328 } 1372 }
1329 else if (w->repeat) 1373 else if (w->repeat)
1330 ev_timer_start (EV_A_ w); 1374 ev_timer_start (EV_A_ w);
1331} 1375}
1332 1376
1377#if EV_PERIODICS
1333void 1378void
1334ev_periodic_start (EV_P_ struct ev_periodic *w) 1379ev_periodic_start (EV_P_ struct ev_periodic *w)
1335{ 1380{
1336 if (ev_is_active (w)) 1381 if (ev_is_active (w))
1337 return; 1382 return;
1338 1383
1339 if (w->reschedule_cb) 1384 if (w->reschedule_cb)
1340 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1385 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1341 else if (w->interval) 1386 else if (w->interval)
1342 { 1387 {
1343 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1388 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1344 /* this formula differs from the one in periodic_reify because we do not always round up */ 1389 /* this formula differs from the one in periodic_reify because we do not always round up */
1345 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1390 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1346 } 1391 }
1347 1392
1348 ev_start (EV_A_ (W)w, ++periodiccnt); 1393 ev_start (EV_A_ (W)w, ++periodiccnt);
1349 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1394 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1350 periodics [periodiccnt - 1] = w; 1395 periodics [periodiccnt - 1] = w;
… …
1372} 1417}
1373 1418
1374void 1419void
1375ev_periodic_again (EV_P_ struct ev_periodic *w) 1420ev_periodic_again (EV_P_ struct ev_periodic *w)
1376{ 1421{
1422 /* TODO: use adjustheap and recalculation */
1377 ev_periodic_stop (EV_A_ w); 1423 ev_periodic_stop (EV_A_ w);
1378 ev_periodic_start (EV_A_ w); 1424 ev_periodic_start (EV_A_ w);
1379} 1425}
1426#endif
1380 1427
1381void 1428void
1382ev_idle_start (EV_P_ struct ev_idle *w) 1429ev_idle_start (EV_P_ struct ev_idle *w)
1383{ 1430{
1384 if (ev_is_active (w)) 1431 if (ev_is_active (w))
… …
1435 1482
1436void 1483void
1437ev_check_stop (EV_P_ struct ev_check *w) 1484ev_check_stop (EV_P_ struct ev_check *w)
1438{ 1485{
1439 ev_clear_pending (EV_A_ (W)w); 1486 ev_clear_pending (EV_A_ (W)w);
1440 if (ev_is_active (w)) 1487 if (!ev_is_active (w))
1441 return; 1488 return;
1442 1489
1443 checks [((W)w)->active - 1] = checks [--checkcnt]; 1490 checks [((W)w)->active - 1] = checks [--checkcnt];
1444 ev_stop (EV_A_ (W)w); 1491 ev_stop (EV_A_ (W)w);
1445} 1492}
… …
1506 1553
1507void 1554void
1508ev_child_stop (EV_P_ struct ev_child *w) 1555ev_child_stop (EV_P_ struct ev_child *w)
1509{ 1556{
1510 ev_clear_pending (EV_A_ (W)w); 1557 ev_clear_pending (EV_A_ (W)w);
1511 if (ev_is_active (w)) 1558 if (!ev_is_active (w))
1512 return; 1559 return;
1513 1560
1514 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1561 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1515 ev_stop (EV_A_ (W)w); 1562 ev_stop (EV_A_ (W)w);
1516} 1563}
… …
1560 else 1607 else
1561 { 1608 {
1562 once->cb = cb; 1609 once->cb = cb;
1563 once->arg = arg; 1610 once->arg = arg;
1564 1611
1565 ev_watcher_init (&once->io, once_cb_io); 1612 ev_init (&once->io, once_cb_io);
1566 if (fd >= 0) 1613 if (fd >= 0)
1567 { 1614 {
1568 ev_io_set (&once->io, fd, events); 1615 ev_io_set (&once->io, fd, events);
1569 ev_io_start (EV_A_ &once->io); 1616 ev_io_start (EV_A_ &once->io);
1570 } 1617 }
1571 1618
1572 ev_watcher_init (&once->to, once_cb_to); 1619 ev_init (&once->to, once_cb_to);
1573 if (timeout >= 0.) 1620 if (timeout >= 0.)
1574 { 1621 {
1575 ev_timer_set (&once->to, timeout, 0.); 1622 ev_timer_set (&once->to, timeout, 0.);
1576 ev_timer_start (EV_A_ &once->to); 1623 ev_timer_start (EV_A_ &once->to);
1577 } 1624 }
1578 } 1625 }
1579} 1626}
1580 1627
1628#ifdef __cplusplus
1629}
1630#endif
1631

Diff Legend

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