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

Comparing libev/ev.c (file contents):
Revision 1.163 by root, Wed Dec 5 13:54:36 2007 UTC vs.
Revision 1.184 by root, Wed Dec 12 05:30:52 2007 UTC

… …
216# include <sys/inotify.h> 216# include <sys/inotify.h>
217#endif 217#endif
218 218
219/**/ 219/**/
220 220
221/*
222 * This is used to avoid floating point rounding problems.
223 * It is added to ev_rt_now when scheduling periodics
224 * to ensure progress, time-wise, even when rounding
225 * errors are against us.
226 * This value is good at least till the year 4000.
227 * Better solutions welcome.
228 */
229#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
230
221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 231#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
222#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 232#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 233/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
224 234
225#if __GNUC__ >= 3 235#if __GNUC__ >= 3
226# define expect(expr,value) __builtin_expect ((expr),(value)) 236# define expect(expr,value) __builtin_expect ((expr),(value))
227# define inline_size static inline /* inline for codesize */
228# if EV_MINIMAL
229# define noinline __attribute__ ((noinline)) 237# define noinline __attribute__ ((noinline))
230# define inline_speed static noinline
231# else
232# define noinline
233# define inline_speed static inline
234# endif
235#else 238#else
236# define expect(expr,value) (expr) 239# define expect(expr,value) (expr)
237# define inline_speed static
238# define inline_size static
239# define noinline 240# define noinline
241# if __STDC_VERSION__ < 199901L
242# define inline
243# endif
240#endif 244#endif
241 245
242#define expect_false(expr) expect ((expr) != 0, 0) 246#define expect_false(expr) expect ((expr) != 0, 0)
243#define expect_true(expr) expect ((expr) != 0, 1) 247#define expect_true(expr) expect ((expr) != 0, 1)
248#define inline_size static inline
249
250#if EV_MINIMAL
251# define inline_speed static noinline
252#else
253# define inline_speed static inline
254#endif
244 255
245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 256#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
246#define ABSPRI(w) ((w)->priority - EV_MINPRI) 257#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247 258
248#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 259#define EMPTY /* required for microsofts broken pseudo-c compiler */
249#define EMPTY2(a,b) /* used to suppress some warnings */ 260#define EMPTY2(a,b) /* used to suppress some warnings */
250 261
251typedef ev_watcher *W; 262typedef ev_watcher *W;
252typedef ev_watcher_list *WL; 263typedef ev_watcher_list *WL;
253typedef ev_watcher_time *WT; 264typedef ev_watcher_time *WT;
… …
417 } 428 }
418 429
419 return ncur; 430 return ncur;
420} 431}
421 432
422inline_speed void * 433static noinline void *
423array_realloc (int elem, void *base, int *cur, int cnt) 434array_realloc (int elem, void *base, int *cur, int cnt)
424{ 435{
425 *cur = array_nextsize (elem, *cur, cnt); 436 *cur = array_nextsize (elem, *cur, cnt);
426 return ev_realloc (base, elem * *cur); 437 return ev_realloc (base, elem * *cur);
427} 438}
… …
452 463
453void noinline 464void noinline
454ev_feed_event (EV_P_ void *w, int revents) 465ev_feed_event (EV_P_ void *w, int revents)
455{ 466{
456 W w_ = (W)w; 467 W w_ = (W)w;
468 int pri = ABSPRI (w_);
457 469
458 if (expect_false (w_->pending)) 470 if (expect_false (w_->pending))
471 pendings [pri][w_->pending - 1].events |= revents;
472 else
459 { 473 {
474 w_->pending = ++pendingcnt [pri];
475 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
476 pendings [pri][w_->pending - 1].w = w_;
460 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 477 pendings [pri][w_->pending - 1].events = revents;
461 return;
462 } 478 }
463
464 w_->pending = ++pendingcnt [ABSPRI (w_)];
465 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
466 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
467 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
468} 479}
469 480
470void inline_size 481void inline_speed
471queue_events (EV_P_ W *events, int eventcnt, int type) 482queue_events (EV_P_ W *events, int eventcnt, int type)
472{ 483{
473 int i; 484 int i;
474 485
475 for (i = 0; i < eventcnt; ++i) 486 for (i = 0; i < eventcnt; ++i)
… …
507} 518}
508 519
509void 520void
510ev_feed_fd_event (EV_P_ int fd, int revents) 521ev_feed_fd_event (EV_P_ int fd, int revents)
511{ 522{
523 if (fd >= 0 && fd < anfdmax)
512 fd_event (EV_A_ fd, revents); 524 fd_event (EV_A_ fd, revents);
513} 525}
514 526
515void inline_size 527void inline_size
516fd_reify (EV_P) 528fd_reify (EV_P)
517{ 529{
… …
521 { 533 {
522 int fd = fdchanges [i]; 534 int fd = fdchanges [i];
523 ANFD *anfd = anfds + fd; 535 ANFD *anfd = anfds + fd;
524 ev_io *w; 536 ev_io *w;
525 537
526 int events = 0; 538 unsigned char events = 0;
527 539
528 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 540 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
529 events |= w->events; 541 events |= (unsigned char)w->events;
530 542
531#if EV_SELECT_IS_WINSOCKET 543#if EV_SELECT_IS_WINSOCKET
532 if (events) 544 if (events)
533 { 545 {
534 unsigned long argp; 546 unsigned long argp;
535 anfd->handle = _get_osfhandle (fd); 547 anfd->handle = _get_osfhandle (fd);
536 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 548 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
537 } 549 }
538#endif 550#endif
539 551
552 {
553 unsigned char o_events = anfd->events;
554 unsigned char o_reify = anfd->reify;
555
540 anfd->reify = 0; 556 anfd->reify = 0;
541
542 backend_modify (EV_A_ fd, anfd->events, events);
543 anfd->events = events; 557 anfd->events = events;
558
559 if (o_events != events || o_reify & EV_IOFDSET)
560 backend_modify (EV_A_ fd, o_events, events);
561 }
544 } 562 }
545 563
546 fdchangecnt = 0; 564 fdchangecnt = 0;
547} 565}
548 566
549void inline_size 567void inline_size
550fd_change (EV_P_ int fd) 568fd_change (EV_P_ int fd, int flags)
551{ 569{
552 if (expect_false (anfds [fd].reify)) 570 unsigned char reify = anfds [fd].reify;
553 return;
554
555 anfds [fd].reify = 1; 571 anfds [fd].reify |= flags;
556 572
573 if (expect_true (!reify))
574 {
557 ++fdchangecnt; 575 ++fdchangecnt;
558 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 576 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
559 fdchanges [fdchangecnt - 1] = fd; 577 fdchanges [fdchangecnt - 1] = fd;
578 }
560} 579}
561 580
562void inline_speed 581void inline_speed
563fd_kill (EV_P_ int fd) 582fd_kill (EV_P_ int fd)
564{ 583{
… …
615 634
616 for (fd = 0; fd < anfdmax; ++fd) 635 for (fd = 0; fd < anfdmax; ++fd)
617 if (anfds [fd].events) 636 if (anfds [fd].events)
618 { 637 {
619 anfds [fd].events = 0; 638 anfds [fd].events = 0;
620 fd_change (EV_A_ fd); 639 fd_change (EV_A_ fd, EV_IOFDSET | 1);
621 } 640 }
622} 641}
623 642
624/*****************************************************************************/ 643/*****************************************************************************/
625 644
626void inline_speed 645void inline_speed
627upheap (WT *heap, int k) 646upheap (WT *heap, int k)
628{ 647{
629 WT w = heap [k]; 648 WT w = heap [k];
630 649
631 while (k && heap [k >> 1]->at > w->at) 650 while (k)
632 { 651 {
652 int p = (k - 1) >> 1;
653
654 if (heap [p]->at <= w->at)
655 break;
656
633 heap [k] = heap [k >> 1]; 657 heap [k] = heap [p];
634 ((W)heap [k])->active = k + 1; 658 ((W)heap [k])->active = k + 1;
635 k >>= 1; 659 k = p;
636 } 660 }
637 661
638 heap [k] = w; 662 heap [k] = w;
639 ((W)heap [k])->active = k + 1; 663 ((W)heap [k])->active = k + 1;
640
641} 664}
642 665
643void inline_speed 666void inline_speed
644downheap (WT *heap, int N, int k) 667downheap (WT *heap, int N, int k)
645{ 668{
646 WT w = heap [k]; 669 WT w = heap [k];
647 670
648 while (k < (N >> 1)) 671 for (;;)
649 { 672 {
650 int j = k << 1; 673 int c = (k << 1) + 1;
651 674
652 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 675 if (c >= N)
653 ++j;
654
655 if (w->at <= heap [j]->at)
656 break; 676 break;
657 677
678 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
679 ? 1 : 0;
680
681 if (w->at <= heap [c]->at)
682 break;
683
658 heap [k] = heap [j]; 684 heap [k] = heap [c];
659 ((W)heap [k])->active = k + 1; 685 ((W)heap [k])->active = k + 1;
686
660 k = j; 687 k = c;
661 } 688 }
662 689
663 heap [k] = w; 690 heap [k] = w;
664 ((W)heap [k])->active = k + 1; 691 ((W)heap [k])->active = k + 1;
665} 692}
… …
747 for (signum = signalmax; signum--; ) 774 for (signum = signalmax; signum--; )
748 if (signals [signum].gotsig) 775 if (signals [signum].gotsig)
749 ev_feed_signal_event (EV_A_ signum + 1); 776 ev_feed_signal_event (EV_A_ signum + 1);
750} 777}
751 778
752void inline_size 779void inline_speed
753fd_intern (int fd) 780fd_intern (int fd)
754{ 781{
755#ifdef _WIN32 782#ifdef _WIN32
756 int arg = 1; 783 int arg = 1;
757 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 784 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
772 ev_unref (EV_A); /* child watcher should not keep loop alive */ 799 ev_unref (EV_A); /* child watcher should not keep loop alive */
773} 800}
774 801
775/*****************************************************************************/ 802/*****************************************************************************/
776 803
777static ev_child *childs [EV_PID_HASHSIZE]; 804static WL childs [EV_PID_HASHSIZE];
778 805
779#ifndef _WIN32 806#ifndef _WIN32
780 807
781static ev_signal childev; 808static ev_signal childev;
782 809
… …
786 ev_child *w; 813 ev_child *w;
787 814
788 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 815 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
789 if (w->pid == pid || !w->pid) 816 if (w->pid == pid || !w->pid)
790 { 817 {
791 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 818 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
792 w->rpid = pid; 819 w->rpid = pid;
793 w->rstatus = status; 820 w->rstatus = status;
794 ev_feed_event (EV_A_ (W)w, EV_CHILD); 821 ev_feed_event (EV_A_ (W)w, EV_CHILD);
795 } 822 }
796} 823}
797 824
798#ifndef WCONTINUED 825#ifndef WCONTINUED
… …
1003#if EV_USE_SELECT 1030#if EV_USE_SELECT
1004 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1031 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
1005#endif 1032#endif
1006 1033
1007 for (i = NUMPRI; i--; ) 1034 for (i = NUMPRI; i--; )
1035 {
1008 array_free (pending, [i]); 1036 array_free (pending, [i]);
1037#if EV_IDLE_ENABLE
1038 array_free (idle, [i]);
1039#endif
1040 }
1009 1041
1010 /* have to use the microsoft-never-gets-it-right macro */ 1042 /* have to use the microsoft-never-gets-it-right macro */
1011 array_free (fdchange, EMPTY0); 1043 array_free (fdchange, EMPTY);
1012 array_free (timer, EMPTY0); 1044 array_free (timer, EMPTY);
1013#if EV_PERIODIC_ENABLE 1045#if EV_PERIODIC_ENABLE
1014 array_free (periodic, EMPTY0); 1046 array_free (periodic, EMPTY);
1015#endif 1047#endif
1016 array_free (idle, EMPTY0);
1017 array_free (prepare, EMPTY0); 1048 array_free (prepare, EMPTY);
1018 array_free (check, EMPTY0); 1049 array_free (check, EMPTY);
1019 1050
1020 backend = 0; 1051 backend = 0;
1021} 1052}
1022 1053
1023void inline_size infy_fork (EV_P); 1054void inline_size infy_fork (EV_P);
… …
1159 postfork = 1; 1190 postfork = 1;
1160} 1191}
1161 1192
1162/*****************************************************************************/ 1193/*****************************************************************************/
1163 1194
1164int inline_size 1195void
1165any_pending (EV_P) 1196ev_invoke (EV_P_ void *w, int revents)
1166{ 1197{
1167 int pri; 1198 EV_CB_INVOKE ((W)w, revents);
1168
1169 for (pri = NUMPRI; pri--; )
1170 if (pendingcnt [pri])
1171 return 1;
1172
1173 return 0;
1174} 1199}
1175 1200
1176void inline_speed 1201void inline_speed
1177call_pending (EV_P) 1202call_pending (EV_P)
1178{ 1203{
… …
1196void inline_size 1221void inline_size
1197timers_reify (EV_P) 1222timers_reify (EV_P)
1198{ 1223{
1199 while (timercnt && ((WT)timers [0])->at <= mn_now) 1224 while (timercnt && ((WT)timers [0])->at <= mn_now)
1200 { 1225 {
1201 ev_timer *w = timers [0]; 1226 ev_timer *w = (ev_timer *)timers [0];
1202 1227
1203 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1228 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1204 1229
1205 /* first reschedule or stop timer */ 1230 /* first reschedule or stop timer */
1206 if (w->repeat) 1231 if (w->repeat)
… …
1209 1234
1210 ((WT)w)->at += w->repeat; 1235 ((WT)w)->at += w->repeat;
1211 if (((WT)w)->at < mn_now) 1236 if (((WT)w)->at < mn_now)
1212 ((WT)w)->at = mn_now; 1237 ((WT)w)->at = mn_now;
1213 1238
1214 downheap ((WT *)timers, timercnt, 0); 1239 downheap (timers, timercnt, 0);
1215 } 1240 }
1216 else 1241 else
1217 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1242 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1218 1243
1219 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1244 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1224void inline_size 1249void inline_size
1225periodics_reify (EV_P) 1250periodics_reify (EV_P)
1226{ 1251{
1227 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1252 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1228 { 1253 {
1229 ev_periodic *w = periodics [0]; 1254 ev_periodic *w = (ev_periodic *)periodics [0];
1230 1255
1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1256 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1232 1257
1233 /* first reschedule or stop timer */ 1258 /* first reschedule or stop timer */
1234 if (w->reschedule_cb) 1259 if (w->reschedule_cb)
1235 { 1260 {
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1261 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1237 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1262 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1238 downheap ((WT *)periodics, periodiccnt, 0); 1263 downheap (periodics, periodiccnt, 0);
1239 } 1264 }
1240 else if (w->interval) 1265 else if (w->interval)
1241 { 1266 {
1242 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1267 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1268 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1243 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1269 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1244 downheap ((WT *)periodics, periodiccnt, 0); 1270 downheap (periodics, periodiccnt, 0);
1245 } 1271 }
1246 else 1272 else
1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1273 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1248 1274
1249 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1275 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1256 int i; 1282 int i;
1257 1283
1258 /* adjust periodics after time jump */ 1284 /* adjust periodics after time jump */
1259 for (i = 0; i < periodiccnt; ++i) 1285 for (i = 0; i < periodiccnt; ++i)
1260 { 1286 {
1261 ev_periodic *w = periodics [i]; 1287 ev_periodic *w = (ev_periodic *)periodics [i];
1262 1288
1263 if (w->reschedule_cb) 1289 if (w->reschedule_cb)
1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1290 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1265 else if (w->interval) 1291 else if (w->interval)
1266 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1292 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1267 } 1293 }
1268 1294
1269 /* now rebuild the heap */ 1295 /* now rebuild the heap */
1270 for (i = periodiccnt >> 1; i--; ) 1296 for (i = periodiccnt >> 1; i--; )
1271 downheap ((WT *)periodics, periodiccnt, i); 1297 downheap (periodics, periodiccnt, i);
1272} 1298}
1273#endif 1299#endif
1274 1300
1301#if EV_IDLE_ENABLE
1275int inline_size 1302void inline_size
1276time_update_monotonic (EV_P) 1303idle_reify (EV_P)
1277{ 1304{
1305 if (expect_false (idleall))
1306 {
1307 int pri;
1308
1309 for (pri = NUMPRI; pri--; )
1310 {
1311 if (pendingcnt [pri])
1312 break;
1313
1314 if (idlecnt [pri])
1315 {
1316 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1317 break;
1318 }
1319 }
1320 }
1321}
1322#endif
1323
1324void inline_speed
1325time_update (EV_P_ ev_tstamp max_block)
1326{
1327 int i;
1328
1329#if EV_USE_MONOTONIC
1330 if (expect_true (have_monotonic))
1331 {
1332 ev_tstamp odiff = rtmn_diff;
1333
1278 mn_now = get_clock (); 1334 mn_now = get_clock ();
1279 1335
1336 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1337 /* interpolate in the meantime */
1280 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1338 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1281 { 1339 {
1282 ev_rt_now = rtmn_diff + mn_now; 1340 ev_rt_now = rtmn_diff + mn_now;
1283 return 0; 1341 return;
1284 } 1342 }
1285 else 1343
1286 {
1287 now_floor = mn_now; 1344 now_floor = mn_now;
1288 ev_rt_now = ev_time (); 1345 ev_rt_now = ev_time ();
1289 return 1;
1290 }
1291}
1292 1346
1293void inline_size 1347 /* loop a few times, before making important decisions.
1294time_update (EV_P) 1348 * on the choice of "4": one iteration isn't enough,
1295{ 1349 * in case we get preempted during the calls to
1296 int i; 1350 * ev_time and get_clock. a second call is almost guaranteed
1297 1351 * to succeed in that case, though. and looping a few more times
1298#if EV_USE_MONOTONIC 1352 * doesn't hurt either as we only do this on time-jumps or
1299 if (expect_true (have_monotonic)) 1353 * in the unlikely event of having been preempted here.
1300 { 1354 */
1301 if (time_update_monotonic (EV_A)) 1355 for (i = 4; --i; )
1302 { 1356 {
1303 ev_tstamp odiff = rtmn_diff;
1304
1305 /* loop a few times, before making important decisions.
1306 * on the choice of "4": one iteration isn't enough,
1307 * in case we get preempted during the calls to
1308 * ev_time and get_clock. a second call is almost guaranteed
1309 * to succeed in that case, though. and looping a few more times
1310 * doesn't hurt either as we only do this on time-jumps or
1311 * in the unlikely event of having been preempted here.
1312 */
1313 for (i = 4; --i; )
1314 {
1315 rtmn_diff = ev_rt_now - mn_now; 1357 rtmn_diff = ev_rt_now - mn_now;
1316 1358
1317 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1359 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1318 return; /* all is well */ 1360 return; /* all is well */
1319 1361
1320 ev_rt_now = ev_time (); 1362 ev_rt_now = ev_time ();
1321 mn_now = get_clock (); 1363 mn_now = get_clock ();
1322 now_floor = mn_now; 1364 now_floor = mn_now;
1323 } 1365 }
1324 1366
1325# if EV_PERIODIC_ENABLE 1367# if EV_PERIODIC_ENABLE
1326 periodics_reschedule (EV_A); 1368 periodics_reschedule (EV_A);
1327# endif 1369# endif
1328 /* no timer adjustment, as the monotonic clock doesn't jump */ 1370 /* no timer adjustment, as the monotonic clock doesn't jump */
1329 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1371 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1330 }
1331 } 1372 }
1332 else 1373 else
1333#endif 1374#endif
1334 { 1375 {
1335 ev_rt_now = ev_time (); 1376 ev_rt_now = ev_time ();
1336 1377
1337 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1378 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1338 { 1379 {
1339#if EV_PERIODIC_ENABLE 1380#if EV_PERIODIC_ENABLE
1340 periodics_reschedule (EV_A); 1381 periodics_reschedule (EV_A);
1341#endif 1382#endif
1342
1343 /* adjust timers. this is easy, as the offset is the same for all of them */ 1383 /* adjust timers. this is easy, as the offset is the same for all of them */
1344 for (i = 0; i < timercnt; ++i) 1384 for (i = 0; i < timercnt; ++i)
1345 ((WT)timers [i])->at += ev_rt_now - mn_now; 1385 ((WT)timers [i])->at += ev_rt_now - mn_now;
1346 } 1386 }
1347 1387
… …
1391 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1431 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1392 call_pending (EV_A); 1432 call_pending (EV_A);
1393 } 1433 }
1394#endif 1434#endif
1395 1435
1396 /* queue check watchers (and execute them) */ 1436 /* queue prepare watchers (and execute them) */
1397 if (expect_false (preparecnt)) 1437 if (expect_false (preparecnt))
1398 { 1438 {
1399 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1439 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1400 call_pending (EV_A); 1440 call_pending (EV_A);
1401 } 1441 }
… …
1412 1452
1413 /* calculate blocking time */ 1453 /* calculate blocking time */
1414 { 1454 {
1415 ev_tstamp block; 1455 ev_tstamp block;
1416 1456
1417 if (expect_false (flags & EVLOOP_NONBLOCK || idlecnt || !activecnt)) 1457 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1418 block = 0.; /* do not block at all */ 1458 block = 0.; /* do not block at all */
1419 else 1459 else
1420 { 1460 {
1421 /* update time to cancel out callback processing overhead */ 1461 /* update time to cancel out callback processing overhead */
1422#if EV_USE_MONOTONIC
1423 if (expect_true (have_monotonic))
1424 time_update_monotonic (EV_A); 1462 time_update (EV_A_ 1e100);
1425 else
1426#endif
1427 {
1428 ev_rt_now = ev_time ();
1429 mn_now = ev_rt_now;
1430 }
1431 1463
1432 block = MAX_BLOCKTIME; 1464 block = MAX_BLOCKTIME;
1433 1465
1434 if (timercnt) 1466 if (timercnt)
1435 { 1467 {
… …
1448 if (expect_false (block < 0.)) block = 0.; 1480 if (expect_false (block < 0.)) block = 0.;
1449 } 1481 }
1450 1482
1451 ++loop_count; 1483 ++loop_count;
1452 backend_poll (EV_A_ block); 1484 backend_poll (EV_A_ block);
1485
1486 /* update ev_rt_now, do magic */
1487 time_update (EV_A_ block);
1453 } 1488 }
1454
1455 /* update ev_rt_now, do magic */
1456 time_update (EV_A);
1457 1489
1458 /* queue pending timers and reschedule them */ 1490 /* queue pending timers and reschedule them */
1459 timers_reify (EV_A); /* relative timers called last */ 1491 timers_reify (EV_A); /* relative timers called last */
1460#if EV_PERIODIC_ENABLE 1492#if EV_PERIODIC_ENABLE
1461 periodics_reify (EV_A); /* absolute timers called first */ 1493 periodics_reify (EV_A); /* absolute timers called first */
1462#endif 1494#endif
1463 1495
1496#if EV_IDLE_ENABLE
1464 /* queue idle watchers unless other events are pending */ 1497 /* queue idle watchers unless other events are pending */
1465 if (idlecnt && !any_pending (EV_A)) 1498 idle_reify (EV_A);
1466 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1499#endif
1467 1500
1468 /* queue check watchers, to be executed first */ 1501 /* queue check watchers, to be executed first */
1469 if (expect_false (checkcnt)) 1502 if (expect_false (checkcnt))
1470 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1503 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1471 1504
… …
1507 head = &(*head)->next; 1540 head = &(*head)->next;
1508 } 1541 }
1509} 1542}
1510 1543
1511void inline_speed 1544void inline_speed
1512ev_clear_pending (EV_P_ W w) 1545clear_pending (EV_P_ W w)
1513{ 1546{
1514 if (w->pending) 1547 if (w->pending)
1515 { 1548 {
1516 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1549 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1517 w->pending = 0; 1550 w->pending = 0;
1518 } 1551 }
1519} 1552}
1520 1553
1554int
1555ev_clear_pending (EV_P_ void *w)
1556{
1557 W w_ = (W)w;
1558 int pending = w_->pending;
1559
1560 if (expect_true (pending))
1561 {
1562 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1563 w_->pending = 0;
1564 p->w = 0;
1565 return p->events;
1566 }
1567 else
1568 return 0;
1569}
1570
1571void inline_size
1572pri_adjust (EV_P_ W w)
1573{
1574 int pri = w->priority;
1575 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1576 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1577 w->priority = pri;
1578}
1579
1521void inline_speed 1580void inline_speed
1522ev_start (EV_P_ W w, int active) 1581ev_start (EV_P_ W w, int active)
1523{ 1582{
1524 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1583 pri_adjust (EV_A_ w);
1525 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1526
1527 w->active = active; 1584 w->active = active;
1528 ev_ref (EV_A); 1585 ev_ref (EV_A);
1529} 1586}
1530 1587
1531void inline_size 1588void inline_size
… …
1535 w->active = 0; 1592 w->active = 0;
1536} 1593}
1537 1594
1538/*****************************************************************************/ 1595/*****************************************************************************/
1539 1596
1540void 1597void noinline
1541ev_io_start (EV_P_ ev_io *w) 1598ev_io_start (EV_P_ ev_io *w)
1542{ 1599{
1543 int fd = w->fd; 1600 int fd = w->fd;
1544 1601
1545 if (expect_false (ev_is_active (w))) 1602 if (expect_false (ev_is_active (w)))
… …
1547 1604
1548 assert (("ev_io_start called with negative fd", fd >= 0)); 1605 assert (("ev_io_start called with negative fd", fd >= 0));
1549 1606
1550 ev_start (EV_A_ (W)w, 1); 1607 ev_start (EV_A_ (W)w, 1);
1551 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1608 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1552 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1609 wlist_add (&anfds[fd].head, (WL)w);
1553 1610
1554 fd_change (EV_A_ fd); 1611 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1612 w->events &= ~EV_IOFDSET;
1555} 1613}
1556 1614
1557void 1615void noinline
1558ev_io_stop (EV_P_ ev_io *w) 1616ev_io_stop (EV_P_ ev_io *w)
1559{ 1617{
1560 ev_clear_pending (EV_A_ (W)w); 1618 clear_pending (EV_A_ (W)w);
1561 if (expect_false (!ev_is_active (w))) 1619 if (expect_false (!ev_is_active (w)))
1562 return; 1620 return;
1563 1621
1564 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1622 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1565 1623
1566 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1624 wlist_del (&anfds[w->fd].head, (WL)w);
1567 ev_stop (EV_A_ (W)w); 1625 ev_stop (EV_A_ (W)w);
1568 1626
1569 fd_change (EV_A_ w->fd); 1627 fd_change (EV_A_ w->fd, 1);
1570} 1628}
1571 1629
1572void 1630void noinline
1573ev_timer_start (EV_P_ ev_timer *w) 1631ev_timer_start (EV_P_ ev_timer *w)
1574{ 1632{
1575 if (expect_false (ev_is_active (w))) 1633 if (expect_false (ev_is_active (w)))
1576 return; 1634 return;
1577 1635
1578 ((WT)w)->at += mn_now; 1636 ((WT)w)->at += mn_now;
1579 1637
1580 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1638 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1581 1639
1582 ev_start (EV_A_ (W)w, ++timercnt); 1640 ev_start (EV_A_ (W)w, ++timercnt);
1583 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1641 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1584 timers [timercnt - 1] = w; 1642 timers [timercnt - 1] = (WT)w;
1585 upheap ((WT *)timers, timercnt - 1); 1643 upheap (timers, timercnt - 1);
1586 1644
1587 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1645 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1588} 1646}
1589 1647
1590void 1648void noinline
1591ev_timer_stop (EV_P_ ev_timer *w) 1649ev_timer_stop (EV_P_ ev_timer *w)
1592{ 1650{
1593 ev_clear_pending (EV_A_ (W)w); 1651 clear_pending (EV_A_ (W)w);
1594 if (expect_false (!ev_is_active (w))) 1652 if (expect_false (!ev_is_active (w)))
1595 return; 1653 return;
1596 1654
1597 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1655 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1598 1656
1599 { 1657 {
1600 int active = ((W)w)->active; 1658 int active = ((W)w)->active;
1601 1659
1602 if (expect_true (--active < --timercnt)) 1660 if (expect_true (--active < --timercnt))
1603 { 1661 {
1604 timers [active] = timers [timercnt]; 1662 timers [active] = timers [timercnt];
1605 adjustheap ((WT *)timers, timercnt, active); 1663 adjustheap (timers, timercnt, active);
1606 } 1664 }
1607 } 1665 }
1608 1666
1609 ((WT)w)->at -= mn_now; 1667 ((WT)w)->at -= mn_now;
1610 1668
1611 ev_stop (EV_A_ (W)w); 1669 ev_stop (EV_A_ (W)w);
1612} 1670}
1613 1671
1614void 1672void noinline
1615ev_timer_again (EV_P_ ev_timer *w) 1673ev_timer_again (EV_P_ ev_timer *w)
1616{ 1674{
1617 if (ev_is_active (w)) 1675 if (ev_is_active (w))
1618 { 1676 {
1619 if (w->repeat) 1677 if (w->repeat)
1620 { 1678 {
1621 ((WT)w)->at = mn_now + w->repeat; 1679 ((WT)w)->at = mn_now + w->repeat;
1622 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1680 adjustheap (timers, timercnt, ((W)w)->active - 1);
1623 } 1681 }
1624 else 1682 else
1625 ev_timer_stop (EV_A_ w); 1683 ev_timer_stop (EV_A_ w);
1626 } 1684 }
1627 else if (w->repeat) 1685 else if (w->repeat)
… …
1630 ev_timer_start (EV_A_ w); 1688 ev_timer_start (EV_A_ w);
1631 } 1689 }
1632} 1690}
1633 1691
1634#if EV_PERIODIC_ENABLE 1692#if EV_PERIODIC_ENABLE
1635void 1693void noinline
1636ev_periodic_start (EV_P_ ev_periodic *w) 1694ev_periodic_start (EV_P_ ev_periodic *w)
1637{ 1695{
1638 if (expect_false (ev_is_active (w))) 1696 if (expect_false (ev_is_active (w)))
1639 return; 1697 return;
1640 1698
… …
1642 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1700 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1643 else if (w->interval) 1701 else if (w->interval)
1644 { 1702 {
1645 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1703 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1646 /* this formula differs from the one in periodic_reify because we do not always round up */ 1704 /* this formula differs from the one in periodic_reify because we do not always round up */
1647 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1705 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1648 } 1706 }
1707 else
1708 ((WT)w)->at = w->offset;
1649 1709
1650 ev_start (EV_A_ (W)w, ++periodiccnt); 1710 ev_start (EV_A_ (W)w, ++periodiccnt);
1651 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1711 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1652 periodics [periodiccnt - 1] = w; 1712 periodics [periodiccnt - 1] = (WT)w;
1653 upheap ((WT *)periodics, periodiccnt - 1); 1713 upheap (periodics, periodiccnt - 1);
1654 1714
1655 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1715 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1656} 1716}
1657 1717
1658void 1718void noinline
1659ev_periodic_stop (EV_P_ ev_periodic *w) 1719ev_periodic_stop (EV_P_ ev_periodic *w)
1660{ 1720{
1661 ev_clear_pending (EV_A_ (W)w); 1721 clear_pending (EV_A_ (W)w);
1662 if (expect_false (!ev_is_active (w))) 1722 if (expect_false (!ev_is_active (w)))
1663 return; 1723 return;
1664 1724
1665 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1725 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1666 1726
1667 { 1727 {
1668 int active = ((W)w)->active; 1728 int active = ((W)w)->active;
1669 1729
1670 if (expect_true (--active < --periodiccnt)) 1730 if (expect_true (--active < --periodiccnt))
1671 { 1731 {
1672 periodics [active] = periodics [periodiccnt]; 1732 periodics [active] = periodics [periodiccnt];
1673 adjustheap ((WT *)periodics, periodiccnt, active); 1733 adjustheap (periodics, periodiccnt, active);
1674 } 1734 }
1675 } 1735 }
1676 1736
1677 ev_stop (EV_A_ (W)w); 1737 ev_stop (EV_A_ (W)w);
1678} 1738}
1679 1739
1680void 1740void noinline
1681ev_periodic_again (EV_P_ ev_periodic *w) 1741ev_periodic_again (EV_P_ ev_periodic *w)
1682{ 1742{
1683 /* TODO: use adjustheap and recalculation */ 1743 /* TODO: use adjustheap and recalculation */
1684 ev_periodic_stop (EV_A_ w); 1744 ev_periodic_stop (EV_A_ w);
1685 ev_periodic_start (EV_A_ w); 1745 ev_periodic_start (EV_A_ w);
… …
1688 1748
1689#ifndef SA_RESTART 1749#ifndef SA_RESTART
1690# define SA_RESTART 0 1750# define SA_RESTART 0
1691#endif 1751#endif
1692 1752
1693void 1753void noinline
1694ev_signal_start (EV_P_ ev_signal *w) 1754ev_signal_start (EV_P_ ev_signal *w)
1695{ 1755{
1696#if EV_MULTIPLICITY 1756#if EV_MULTIPLICITY
1697 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1757 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1698#endif 1758#endif
1699 if (expect_false (ev_is_active (w))) 1759 if (expect_false (ev_is_active (w)))
1700 return; 1760 return;
1701 1761
1702 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1762 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1703 1763
1764 {
1765#ifndef _WIN32
1766 sigset_t full, prev;
1767 sigfillset (&full);
1768 sigprocmask (SIG_SETMASK, &full, &prev);
1769#endif
1770
1771 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1772
1773#ifndef _WIN32
1774 sigprocmask (SIG_SETMASK, &prev, 0);
1775#endif
1776 }
1777
1704 ev_start (EV_A_ (W)w, 1); 1778 ev_start (EV_A_ (W)w, 1);
1705 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1706 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1779 wlist_add (&signals [w->signum - 1].head, (WL)w);
1707 1780
1708 if (!((WL)w)->next) 1781 if (!((WL)w)->next)
1709 { 1782 {
1710#if _WIN32 1783#if _WIN32
1711 signal (w->signum, sighandler); 1784 signal (w->signum, sighandler);
… …
1717 sigaction (w->signum, &sa, 0); 1790 sigaction (w->signum, &sa, 0);
1718#endif 1791#endif
1719 } 1792 }
1720} 1793}
1721 1794
1722void 1795void noinline
1723ev_signal_stop (EV_P_ ev_signal *w) 1796ev_signal_stop (EV_P_ ev_signal *w)
1724{ 1797{
1725 ev_clear_pending (EV_A_ (W)w); 1798 clear_pending (EV_A_ (W)w);
1726 if (expect_false (!ev_is_active (w))) 1799 if (expect_false (!ev_is_active (w)))
1727 return; 1800 return;
1728 1801
1729 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1802 wlist_del (&signals [w->signum - 1].head, (WL)w);
1730 ev_stop (EV_A_ (W)w); 1803 ev_stop (EV_A_ (W)w);
1731 1804
1732 if (!signals [w->signum - 1].head) 1805 if (!signals [w->signum - 1].head)
1733 signal (w->signum, SIG_DFL); 1806 signal (w->signum, SIG_DFL);
1734} 1807}
… …
1741#endif 1814#endif
1742 if (expect_false (ev_is_active (w))) 1815 if (expect_false (ev_is_active (w)))
1743 return; 1816 return;
1744 1817
1745 ev_start (EV_A_ (W)w, 1); 1818 ev_start (EV_A_ (W)w, 1);
1746 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1819 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1747} 1820}
1748 1821
1749void 1822void
1750ev_child_stop (EV_P_ ev_child *w) 1823ev_child_stop (EV_P_ ev_child *w)
1751{ 1824{
1752 ev_clear_pending (EV_A_ (W)w); 1825 clear_pending (EV_A_ (W)w);
1753 if (expect_false (!ev_is_active (w))) 1826 if (expect_false (!ev_is_active (w)))
1754 return; 1827 return;
1755 1828
1756 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1829 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1757 ev_stop (EV_A_ (W)w); 1830 ev_stop (EV_A_ (W)w);
1758} 1831}
1759 1832
1760#if EV_STAT_ENABLE 1833#if EV_STAT_ENABLE
1761 1834
… …
1993} 2066}
1994 2067
1995void 2068void
1996ev_stat_stop (EV_P_ ev_stat *w) 2069ev_stat_stop (EV_P_ ev_stat *w)
1997{ 2070{
1998 ev_clear_pending (EV_A_ (W)w); 2071 clear_pending (EV_A_ (W)w);
1999 if (expect_false (!ev_is_active (w))) 2072 if (expect_false (!ev_is_active (w)))
2000 return; 2073 return;
2001 2074
2002#if EV_USE_INOTIFY 2075#if EV_USE_INOTIFY
2003 infy_del (EV_A_ w); 2076 infy_del (EV_A_ w);
… …
2006 2079
2007 ev_stop (EV_A_ (W)w); 2080 ev_stop (EV_A_ (W)w);
2008} 2081}
2009#endif 2082#endif
2010 2083
2084#if EV_IDLE_ENABLE
2011void 2085void
2012ev_idle_start (EV_P_ ev_idle *w) 2086ev_idle_start (EV_P_ ev_idle *w)
2013{ 2087{
2014 if (expect_false (ev_is_active (w))) 2088 if (expect_false (ev_is_active (w)))
2015 return; 2089 return;
2016 2090
2091 pri_adjust (EV_A_ (W)w);
2092
2093 {
2094 int active = ++idlecnt [ABSPRI (w)];
2095
2096 ++idleall;
2017 ev_start (EV_A_ (W)w, ++idlecnt); 2097 ev_start (EV_A_ (W)w, active);
2098
2018 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2099 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2019 idles [idlecnt - 1] = w; 2100 idles [ABSPRI (w)][active - 1] = w;
2101 }
2020} 2102}
2021 2103
2022void 2104void
2023ev_idle_stop (EV_P_ ev_idle *w) 2105ev_idle_stop (EV_P_ ev_idle *w)
2024{ 2106{
2025 ev_clear_pending (EV_A_ (W)w); 2107 clear_pending (EV_A_ (W)w);
2026 if (expect_false (!ev_is_active (w))) 2108 if (expect_false (!ev_is_active (w)))
2027 return; 2109 return;
2028 2110
2029 { 2111 {
2030 int active = ((W)w)->active; 2112 int active = ((W)w)->active;
2031 idles [active - 1] = idles [--idlecnt]; 2113
2114 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2032 ((W)idles [active - 1])->active = active; 2115 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2116
2117 ev_stop (EV_A_ (W)w);
2118 --idleall;
2033 } 2119 }
2034
2035 ev_stop (EV_A_ (W)w);
2036} 2120}
2121#endif
2037 2122
2038void 2123void
2039ev_prepare_start (EV_P_ ev_prepare *w) 2124ev_prepare_start (EV_P_ ev_prepare *w)
2040{ 2125{
2041 if (expect_false (ev_is_active (w))) 2126 if (expect_false (ev_is_active (w)))
… …
2047} 2132}
2048 2133
2049void 2134void
2050ev_prepare_stop (EV_P_ ev_prepare *w) 2135ev_prepare_stop (EV_P_ ev_prepare *w)
2051{ 2136{
2052 ev_clear_pending (EV_A_ (W)w); 2137 clear_pending (EV_A_ (W)w);
2053 if (expect_false (!ev_is_active (w))) 2138 if (expect_false (!ev_is_active (w)))
2054 return; 2139 return;
2055 2140
2056 { 2141 {
2057 int active = ((W)w)->active; 2142 int active = ((W)w)->active;
… …
2074} 2159}
2075 2160
2076void 2161void
2077ev_check_stop (EV_P_ ev_check *w) 2162ev_check_stop (EV_P_ ev_check *w)
2078{ 2163{
2079 ev_clear_pending (EV_A_ (W)w); 2164 clear_pending (EV_A_ (W)w);
2080 if (expect_false (!ev_is_active (w))) 2165 if (expect_false (!ev_is_active (w)))
2081 return; 2166 return;
2082 2167
2083 { 2168 {
2084 int active = ((W)w)->active; 2169 int active = ((W)w)->active;
… …
2126} 2211}
2127 2212
2128void 2213void
2129ev_embed_stop (EV_P_ ev_embed *w) 2214ev_embed_stop (EV_P_ ev_embed *w)
2130{ 2215{
2131 ev_clear_pending (EV_A_ (W)w); 2216 clear_pending (EV_A_ (W)w);
2132 if (expect_false (!ev_is_active (w))) 2217 if (expect_false (!ev_is_active (w)))
2133 return; 2218 return;
2134 2219
2135 ev_io_stop (EV_A_ &w->io); 2220 ev_io_stop (EV_A_ &w->io);
2136 2221
… …
2151} 2236}
2152 2237
2153void 2238void
2154ev_fork_stop (EV_P_ ev_fork *w) 2239ev_fork_stop (EV_P_ ev_fork *w)
2155{ 2240{
2156 ev_clear_pending (EV_A_ (W)w); 2241 clear_pending (EV_A_ (W)w);
2157 if (expect_false (!ev_is_active (w))) 2242 if (expect_false (!ev_is_active (w)))
2158 return; 2243 return;
2159 2244
2160 { 2245 {
2161 int active = ((W)w)->active; 2246 int active = ((W)w)->active;

Diff Legend

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