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

Comparing libev/ev.c (file contents):
Revision 1.84 by root, Fri Nov 9 23:04:35 2007 UTC vs.
Revision 1.99 by root, Sun Nov 11 02:26:47 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
… …
152typedef struct ev_watcher_list *WL; 161typedef struct ev_watcher_list *WL;
153typedef struct ev_watcher_time *WT; 162typedef struct ev_watcher_time *WT;
154 163
155static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 164static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
156 165
166#ifdef WIN32
157#include "ev_win32.c" 167# include "ev_win32.c"
168#endif
158 169
159/*****************************************************************************/ 170/*****************************************************************************/
160 171
161static void (*syserr_cb)(const char *msg); 172static void (*syserr_cb)(const char *msg);
162 173
… …
221 232
222#if EV_MULTIPLICITY 233#if EV_MULTIPLICITY
223 234
224 struct ev_loop 235 struct ev_loop
225 { 236 {
237 ev_tstamp ev_rt_now;
238 #define ev_rt_now ((loop)->ev_rt_now)
226 #define VAR(name,decl) decl; 239 #define VAR(name,decl) decl;
227 #include "ev_vars.h" 240 #include "ev_vars.h"
228 #undef VAR 241 #undef VAR
229 }; 242 };
230 #include "ev_wrap.h" 243 #include "ev_wrap.h"
… …
232 struct ev_loop default_loop_struct; 245 struct ev_loop default_loop_struct;
233 static struct ev_loop *default_loop; 246 static struct ev_loop *default_loop;
234 247
235#else 248#else
236 249
250 ev_tstamp ev_rt_now;
237 #define VAR(name,decl) static decl; 251 #define VAR(name,decl) static decl;
238 #include "ev_vars.h" 252 #include "ev_vars.h"
239 #undef VAR 253 #undef VAR
240 254
241 static int default_loop; 255 static int default_loop;
242 256
243#endif 257#endif
244 258
245/*****************************************************************************/ 259/*****************************************************************************/
246 260
247inline ev_tstamp 261ev_tstamp
248ev_time (void) 262ev_time (void)
249{ 263{
250#if EV_USE_REALTIME 264#if EV_USE_REALTIME
251 struct timespec ts; 265 struct timespec ts;
252 clock_gettime (CLOCK_REALTIME, &ts); 266 clock_gettime (CLOCK_REALTIME, &ts);
… …
271#endif 285#endif
272 286
273 return ev_time (); 287 return ev_time ();
274} 288}
275 289
290#if EV_MULTIPLICITY
276ev_tstamp 291ev_tstamp
277ev_now (EV_P) 292ev_now (EV_P)
278{ 293{
279 return rt_now; 294 return ev_rt_now;
280} 295}
296#endif
281 297
282#define array_roundsize(type,n) ((n) | 4 & ~3) 298#define array_roundsize(type,n) ((n) | 4 & ~3)
283 299
284#define array_needsize(type,base,cur,cnt,init) \ 300#define array_needsize(type,base,cur,cnt,init) \
285 if (expect_false ((cnt) > cur)) \ 301 if (expect_false ((cnt) > cur)) \
… …
519 heap [k] = w; 535 heap [k] = w;
520 ((W)heap [k])->active = k + 1; 536 ((W)heap [k])->active = k + 1;
521} 537}
522 538
523inline void 539inline void
524adjustheap (WT *heap, int N, int k, ev_tstamp at) 540adjustheap (WT *heap, int N, int k)
525{ 541{
526 ev_tstamp old_at = heap [k]->at; 542 upheap (heap, k);
527 heap [k]->at = at;
528
529 if (old_at < at)
530 downheap (heap, N, k); 543 downheap (heap, N, k);
531 else
532 upheap (heap, k);
533} 544}
534 545
535/*****************************************************************************/ 546/*****************************************************************************/
536 547
537typedef struct 548typedef struct
… …
735 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 746 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
736 have_monotonic = 1; 747 have_monotonic = 1;
737 } 748 }
738#endif 749#endif
739 750
740 rt_now = ev_time (); 751 ev_rt_now = ev_time ();
741 mn_now = get_clock (); 752 mn_now = get_clock ();
742 now_floor = mn_now; 753 now_floor = mn_now;
743 rtmn_diff = rt_now - mn_now; 754 rtmn_diff = ev_rt_now - mn_now;
744 755
745 if (methods == EVMETHOD_AUTO) 756 if (methods == EVMETHOD_AUTO)
746 if (!enable_secure () && getenv ("LIBEV_METHODS")) 757 if (!enable_secure () && getenv ("LIBEV_METHODS"))
747 methods = atoi (getenv ("LIBEV_METHODS")); 758 methods = atoi (getenv ("LIBEV_METHODS"));
748 else 759 else
… …
795 array_free (pending, [i]); 806 array_free (pending, [i]);
796 807
797 /* have to use the microsoft-never-gets-it-right macro */ 808 /* have to use the microsoft-never-gets-it-right macro */
798 array_free_microshit (fdchange); 809 array_free_microshit (fdchange);
799 array_free_microshit (timer); 810 array_free_microshit (timer);
811#if EV_PERIODICS
800 array_free_microshit (periodic); 812 array_free_microshit (periodic);
813#endif
801 array_free_microshit (idle); 814 array_free_microshit (idle);
802 array_free_microshit (prepare); 815 array_free_microshit (prepare);
803 array_free_microshit (check); 816 array_free_microshit (check);
804 817
805 method = 0; 818 method = 0;
… …
978 991
979 /* first reschedule or stop timer */ 992 /* first reschedule or stop timer */
980 if (w->repeat) 993 if (w->repeat)
981 { 994 {
982 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 995 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
996
983 ((WT)w)->at = mn_now + w->repeat; 997 ((WT)w)->at += w->repeat;
998 if (((WT)w)->at < mn_now)
999 ((WT)w)->at = mn_now;
1000
984 downheap ((WT *)timers, timercnt, 0); 1001 downheap ((WT *)timers, timercnt, 0);
985 } 1002 }
986 else 1003 else
987 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1004 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
988 1005
989 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1006 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
990 } 1007 }
991} 1008}
992 1009
1010#if EV_PERIODICS
993static void 1011static void
994periodics_reify (EV_P) 1012periodics_reify (EV_P)
995{ 1013{
996 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1014 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
997 { 1015 {
998 struct ev_periodic *w = periodics [0]; 1016 struct ev_periodic *w = periodics [0];
999 1017
1000 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1018 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1001 1019
1002 /* first reschedule or stop timer */ 1020 /* first reschedule or stop timer */
1003 if (w->reschedule_cb) 1021 if (w->reschedule_cb)
1004 { 1022 {
1005 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1023 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1006 1024
1007 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1025 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1008 downheap ((WT *)periodics, periodiccnt, 0); 1026 downheap ((WT *)periodics, periodiccnt, 0);
1009 } 1027 }
1010 else if (w->interval) 1028 else if (w->interval)
1011 { 1029 {
1012 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1030 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
1013 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1031 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1014 downheap ((WT *)periodics, periodiccnt, 0); 1032 downheap ((WT *)periodics, periodiccnt, 0);
1015 } 1033 }
1016 else 1034 else
1017 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1035 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1018 1036
… …
1029 for (i = 0; i < periodiccnt; ++i) 1047 for (i = 0; i < periodiccnt; ++i)
1030 { 1048 {
1031 struct ev_periodic *w = periodics [i]; 1049 struct ev_periodic *w = periodics [i];
1032 1050
1033 if (w->reschedule_cb) 1051 if (w->reschedule_cb)
1034 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1052 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1035 else if (w->interval) 1053 else if (w->interval)
1036 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1054 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1037 } 1055 }
1038 1056
1039 /* now rebuild the heap */ 1057 /* now rebuild the heap */
1040 for (i = periodiccnt >> 1; i--; ) 1058 for (i = periodiccnt >> 1; i--; )
1041 downheap ((WT *)periodics, periodiccnt, i); 1059 downheap ((WT *)periodics, periodiccnt, i);
1042} 1060}
1061#endif
1043 1062
1044inline int 1063inline int
1045time_update_monotonic (EV_P) 1064time_update_monotonic (EV_P)
1046{ 1065{
1047 mn_now = get_clock (); 1066 mn_now = get_clock ();
1048 1067
1049 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1068 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1050 { 1069 {
1051 rt_now = rtmn_diff + mn_now; 1070 ev_rt_now = rtmn_diff + mn_now;
1052 return 0; 1071 return 0;
1053 } 1072 }
1054 else 1073 else
1055 { 1074 {
1056 now_floor = mn_now; 1075 now_floor = mn_now;
1057 rt_now = ev_time (); 1076 ev_rt_now = ev_time ();
1058 return 1; 1077 return 1;
1059 } 1078 }
1060} 1079}
1061 1080
1062static void 1081static void
… …
1071 { 1090 {
1072 ev_tstamp odiff = rtmn_diff; 1091 ev_tstamp odiff = rtmn_diff;
1073 1092
1074 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1093 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1075 { 1094 {
1076 rtmn_diff = rt_now - mn_now; 1095 rtmn_diff = ev_rt_now - mn_now;
1077 1096
1078 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1097 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1079 return; /* all is well */ 1098 return; /* all is well */
1080 1099
1081 rt_now = ev_time (); 1100 ev_rt_now = ev_time ();
1082 mn_now = get_clock (); 1101 mn_now = get_clock ();
1083 now_floor = mn_now; 1102 now_floor = mn_now;
1084 } 1103 }
1085 1104
1105# if EV_PERIODICS
1086 periodics_reschedule (EV_A); 1106 periodics_reschedule (EV_A);
1107# endif
1087 /* no timer adjustment, as the monotonic clock doesn't jump */ 1108 /* no timer adjustment, as the monotonic clock doesn't jump */
1088 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1109 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1089 } 1110 }
1090 } 1111 }
1091 else 1112 else
1092#endif 1113#endif
1093 { 1114 {
1094 rt_now = ev_time (); 1115 ev_rt_now = ev_time ();
1095 1116
1096 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1117 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1097 { 1118 {
1119#if EV_PERIODICS
1098 periodics_reschedule (EV_A); 1120 periodics_reschedule (EV_A);
1121#endif
1099 1122
1100 /* adjust timers. this is easy, as the offset is the same for all */ 1123 /* adjust timers. this is easy, as the offset is the same for all */
1101 for (i = 0; i < timercnt; ++i) 1124 for (i = 0; i < timercnt; ++i)
1102 ((WT)timers [i])->at += rt_now - mn_now; 1125 ((WT)timers [i])->at += ev_rt_now - mn_now;
1103 } 1126 }
1104 1127
1105 mn_now = rt_now; 1128 mn_now = ev_rt_now;
1106 } 1129 }
1107} 1130}
1108 1131
1109void 1132void
1110ev_ref (EV_P) 1133ev_ref (EV_P)
… …
1150 if (expect_true (have_monotonic)) 1173 if (expect_true (have_monotonic))
1151 time_update_monotonic (EV_A); 1174 time_update_monotonic (EV_A);
1152 else 1175 else
1153#endif 1176#endif
1154 { 1177 {
1155 rt_now = ev_time (); 1178 ev_rt_now = ev_time ();
1156 mn_now = rt_now; 1179 mn_now = ev_rt_now;
1157 } 1180 }
1158 1181
1159 if (flags & EVLOOP_NONBLOCK || idlecnt) 1182 if (flags & EVLOOP_NONBLOCK || idlecnt)
1160 block = 0.; 1183 block = 0.;
1161 else 1184 else
… …
1166 { 1189 {
1167 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1190 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1168 if (block > to) block = to; 1191 if (block > to) block = to;
1169 } 1192 }
1170 1193
1194#if EV_PERIODICS
1171 if (periodiccnt) 1195 if (periodiccnt)
1172 { 1196 {
1173 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1197 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1174 if (block > to) block = to; 1198 if (block > to) block = to;
1175 } 1199 }
1200#endif
1176 1201
1177 if (block < 0.) block = 0.; 1202 if (block < 0.) block = 0.;
1178 } 1203 }
1179 1204
1180 method_poll (EV_A_ block); 1205 method_poll (EV_A_ block);
1181 1206
1182 /* update rt_now, do magic */ 1207 /* update ev_rt_now, do magic */
1183 time_update (EV_A); 1208 time_update (EV_A);
1184 1209
1185 /* queue pending timers and reschedule them */ 1210 /* queue pending timers and reschedule them */
1186 timers_reify (EV_A); /* relative timers called last */ 1211 timers_reify (EV_A); /* relative timers called last */
1212#if EV_PERIODICS
1187 periodics_reify (EV_A); /* absolute timers called first */ 1213 periodics_reify (EV_A); /* absolute timers called first */
1214#endif
1188 1215
1189 /* queue idle watchers unless io or timers are pending */ 1216 /* queue idle watchers unless io or timers are pending */
1190 if (idlecnt && !any_pending (EV_A)) 1217 if (idlecnt && !any_pending (EV_A))
1191 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1218 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1192 1219
… …
1283{ 1310{
1284 ev_clear_pending (EV_A_ (W)w); 1311 ev_clear_pending (EV_A_ (W)w);
1285 if (!ev_is_active (w)) 1312 if (!ev_is_active (w))
1286 return; 1313 return;
1287 1314
1315 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1316
1288 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1317 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1289 ev_stop (EV_A_ (W)w); 1318 ev_stop (EV_A_ (W)w);
1290 1319
1291 fd_change (EV_A_ w->fd); 1320 fd_change (EV_A_ w->fd);
1292} 1321}
… …
1319 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1348 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1320 1349
1321 if (((W)w)->active < timercnt--) 1350 if (((W)w)->active < timercnt--)
1322 { 1351 {
1323 timers [((W)w)->active - 1] = timers [timercnt]; 1352 timers [((W)w)->active - 1] = timers [timercnt];
1324 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1353 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1325 } 1354 }
1326 1355
1327 ((WT)w)->at = w->repeat; 1356 ((WT)w)->at -= mn_now;
1328 1357
1329 ev_stop (EV_A_ (W)w); 1358 ev_stop (EV_A_ (W)w);
1330} 1359}
1331 1360
1332void 1361void
1333ev_timer_again (EV_P_ struct ev_timer *w) 1362ev_timer_again (EV_P_ struct ev_timer *w)
1334{ 1363{
1335 if (ev_is_active (w)) 1364 if (ev_is_active (w))
1336 { 1365 {
1337 if (w->repeat) 1366 if (w->repeat)
1367 {
1368 ((WT)w)->at = mn_now + w->repeat;
1338 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1369 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1370 }
1339 else 1371 else
1340 ev_timer_stop (EV_A_ w); 1372 ev_timer_stop (EV_A_ w);
1341 } 1373 }
1342 else if (w->repeat) 1374 else if (w->repeat)
1343 ev_timer_start (EV_A_ w); 1375 ev_timer_start (EV_A_ w);
1344} 1376}
1345 1377
1378#if EV_PERIODICS
1346void 1379void
1347ev_periodic_start (EV_P_ struct ev_periodic *w) 1380ev_periodic_start (EV_P_ struct ev_periodic *w)
1348{ 1381{
1349 if (ev_is_active (w)) 1382 if (ev_is_active (w))
1350 return; 1383 return;
1351 1384
1352 if (w->reschedule_cb) 1385 if (w->reschedule_cb)
1353 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1386 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1354 else if (w->interval) 1387 else if (w->interval)
1355 { 1388 {
1356 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1389 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1357 /* this formula differs from the one in periodic_reify because we do not always round up */ 1390 /* this formula differs from the one in periodic_reify because we do not always round up */
1358 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1391 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1359 } 1392 }
1360 1393
1361 ev_start (EV_A_ (W)w, ++periodiccnt); 1394 ev_start (EV_A_ (W)w, ++periodiccnt);
1362 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1395 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1363 periodics [periodiccnt - 1] = w; 1396 periodics [periodiccnt - 1] = w;
… …
1376 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1409 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1377 1410
1378 if (((W)w)->active < periodiccnt--) 1411 if (((W)w)->active < periodiccnt--)
1379 { 1412 {
1380 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1413 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1381 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1414 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1382 } 1415 }
1383 1416
1384 ev_stop (EV_A_ (W)w); 1417 ev_stop (EV_A_ (W)w);
1385} 1418}
1386 1419
… …
1389{ 1422{
1390 /* TODO: use adjustheap and recalculation */ 1423 /* TODO: use adjustheap and recalculation */
1391 ev_periodic_stop (EV_A_ w); 1424 ev_periodic_stop (EV_A_ w);
1392 ev_periodic_start (EV_A_ w); 1425 ev_periodic_start (EV_A_ w);
1393} 1426}
1427#endif
1394 1428
1395void 1429void
1396ev_idle_start (EV_P_ struct ev_idle *w) 1430ev_idle_start (EV_P_ struct ev_idle *w)
1397{ 1431{
1398 if (ev_is_active (w)) 1432 if (ev_is_active (w))
… …
1449 1483
1450void 1484void
1451ev_check_stop (EV_P_ struct ev_check *w) 1485ev_check_stop (EV_P_ struct ev_check *w)
1452{ 1486{
1453 ev_clear_pending (EV_A_ (W)w); 1487 ev_clear_pending (EV_A_ (W)w);
1454 if (ev_is_active (w)) 1488 if (!ev_is_active (w))
1455 return; 1489 return;
1456 1490
1457 checks [((W)w)->active - 1] = checks [--checkcnt]; 1491 checks [((W)w)->active - 1] = checks [--checkcnt];
1458 ev_stop (EV_A_ (W)w); 1492 ev_stop (EV_A_ (W)w);
1459} 1493}
… …
1520 1554
1521void 1555void
1522ev_child_stop (EV_P_ struct ev_child *w) 1556ev_child_stop (EV_P_ struct ev_child *w)
1523{ 1557{
1524 ev_clear_pending (EV_A_ (W)w); 1558 ev_clear_pending (EV_A_ (W)w);
1525 if (ev_is_active (w)) 1559 if (!ev_is_active (w))
1526 return; 1560 return;
1527 1561
1528 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1562 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1529 ev_stop (EV_A_ (W)w); 1563 ev_stop (EV_A_ (W)w);
1530} 1564}
… …
1590 ev_timer_start (EV_A_ &once->to); 1624 ev_timer_start (EV_A_ &once->to);
1591 } 1625 }
1592 } 1626 }
1593} 1627}
1594 1628
1629#ifdef __cplusplus
1630}
1631#endif
1632

Diff Legend

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