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.185 by root, Fri Dec 14 18:22:30 2007 UTC

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

Diff Legend

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