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

Comparing libev/ev.c (file contents):
Revision 1.159 by root, Sat Dec 1 19:48: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;
… …
396{ 407{
397 return ev_rt_now; 408 return ev_rt_now;
398} 409}
399#endif 410#endif
400 411
401#define array_roundsize(type,n) (((n) | 4) & ~3) 412int inline_size
413array_nextsize (int elem, int cur, int cnt)
414{
415 int ncur = cur + 1;
416
417 do
418 ncur <<= 1;
419 while (cnt > ncur);
420
421 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
422 if (elem * ncur > 4096)
423 {
424 ncur *= elem;
425 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
426 ncur = ncur - sizeof (void *) * 4;
427 ncur /= elem;
428 }
429
430 return ncur;
431}
432
433static noinline void *
434array_realloc (int elem, void *base, int *cur, int cnt)
435{
436 *cur = array_nextsize (elem, *cur, cnt);
437 return ev_realloc (base, elem * *cur);
438}
402 439
403#define array_needsize(type,base,cur,cnt,init) \ 440#define array_needsize(type,base,cur,cnt,init) \
404 if (expect_false ((cnt) > cur)) \ 441 if (expect_false ((cnt) > (cur))) \
405 { \ 442 { \
406 int newcnt = cur; \ 443 int ocur_ = (cur); \
407 do \ 444 (base) = (type *)array_realloc \
408 { \ 445 (sizeof (type), (base), &(cur), (cnt)); \
409 newcnt = array_roundsize (type, newcnt << 1); \ 446 init ((base) + (ocur_), (cur) - ocur_); \
410 } \
411 while ((cnt) > newcnt); \
412 \
413 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
414 init (base + cur, newcnt - cur); \
415 cur = newcnt; \
416 } 447 }
417 448
449#if 0
418#define array_slim(type,stem) \ 450#define array_slim(type,stem) \
419 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 451 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
420 { \ 452 { \
421 stem ## max = array_roundsize (stem ## cnt >> 1); \ 453 stem ## max = array_roundsize (stem ## cnt >> 1); \
422 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 454 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
423 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 455 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
424 } 456 }
457#endif
425 458
426#define array_free(stem, idx) \ 459#define array_free(stem, idx) \
427 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 460 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
428 461
429/*****************************************************************************/ 462/*****************************************************************************/
430 463
431void noinline 464void noinline
432ev_feed_event (EV_P_ void *w, int revents) 465ev_feed_event (EV_P_ void *w, int revents)
433{ 466{
434 W w_ = (W)w; 467 W w_ = (W)w;
468 int pri = ABSPRI (w_);
435 469
436 if (expect_false (w_->pending)) 470 if (expect_false (w_->pending))
471 pendings [pri][w_->pending - 1].events |= revents;
472 else
437 { 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_;
438 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 477 pendings [pri][w_->pending - 1].events = revents;
439 return;
440 } 478 }
441
442 w_->pending = ++pendingcnt [ABSPRI (w_)];
443 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
444 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
445 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
446} 479}
447 480
448void inline_size 481void inline_speed
449queue_events (EV_P_ W *events, int eventcnt, int type) 482queue_events (EV_P_ W *events, int eventcnt, int type)
450{ 483{
451 int i; 484 int i;
452 485
453 for (i = 0; i < eventcnt; ++i) 486 for (i = 0; i < eventcnt; ++i)
… …
485} 518}
486 519
487void 520void
488ev_feed_fd_event (EV_P_ int fd, int revents) 521ev_feed_fd_event (EV_P_ int fd, int revents)
489{ 522{
523 if (fd >= 0 && fd < anfdmax)
490 fd_event (EV_A_ fd, revents); 524 fd_event (EV_A_ fd, revents);
491} 525}
492 526
493void inline_size 527void inline_size
494fd_reify (EV_P) 528fd_reify (EV_P)
495{ 529{
… …
499 { 533 {
500 int fd = fdchanges [i]; 534 int fd = fdchanges [i];
501 ANFD *anfd = anfds + fd; 535 ANFD *anfd = anfds + fd;
502 ev_io *w; 536 ev_io *w;
503 537
504 int events = 0; 538 unsigned char events = 0;
505 539
506 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)
507 events |= w->events; 541 events |= (unsigned char)w->events;
508 542
509#if EV_SELECT_IS_WINSOCKET 543#if EV_SELECT_IS_WINSOCKET
510 if (events) 544 if (events)
511 { 545 {
512 unsigned long argp; 546 unsigned long argp;
513 anfd->handle = _get_osfhandle (fd); 547 anfd->handle = _get_osfhandle (fd);
514 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));
515 } 549 }
516#endif 550#endif
517 551
552 {
553 unsigned char o_events = anfd->events;
554 unsigned char o_reify = anfd->reify;
555
518 anfd->reify = 0; 556 anfd->reify = 0;
519
520 backend_modify (EV_A_ fd, anfd->events, events);
521 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 }
522 } 562 }
523 563
524 fdchangecnt = 0; 564 fdchangecnt = 0;
525} 565}
526 566
527void inline_size 567void inline_size
528fd_change (EV_P_ int fd) 568fd_change (EV_P_ int fd, int flags)
529{ 569{
530 if (expect_false (anfds [fd].reify)) 570 unsigned char reify = anfds [fd].reify;
531 return;
532
533 anfds [fd].reify = 1; 571 anfds [fd].reify |= flags;
534 572
573 if (expect_true (!reify))
574 {
535 ++fdchangecnt; 575 ++fdchangecnt;
536 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 576 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
537 fdchanges [fdchangecnt - 1] = fd; 577 fdchanges [fdchangecnt - 1] = fd;
578 }
538} 579}
539 580
540void inline_speed 581void inline_speed
541fd_kill (EV_P_ int fd) 582fd_kill (EV_P_ int fd)
542{ 583{
… …
593 634
594 for (fd = 0; fd < anfdmax; ++fd) 635 for (fd = 0; fd < anfdmax; ++fd)
595 if (anfds [fd].events) 636 if (anfds [fd].events)
596 { 637 {
597 anfds [fd].events = 0; 638 anfds [fd].events = 0;
598 fd_change (EV_A_ fd); 639 fd_change (EV_A_ fd, EV_IOFDSET | 1);
599 } 640 }
600} 641}
601 642
602/*****************************************************************************/ 643/*****************************************************************************/
603 644
604void inline_speed 645void inline_speed
605upheap (WT *heap, int k) 646upheap (WT *heap, int k)
606{ 647{
607 WT w = heap [k]; 648 WT w = heap [k];
608 649
609 while (k && heap [k >> 1]->at > w->at) 650 while (k)
610 { 651 {
652 int p = (k - 1) >> 1;
653
654 if (heap [p]->at <= w->at)
655 break;
656
611 heap [k] = heap [k >> 1]; 657 heap [k] = heap [p];
612 ((W)heap [k])->active = k + 1; 658 ((W)heap [k])->active = k + 1;
613 k >>= 1; 659 k = p;
614 } 660 }
615 661
616 heap [k] = w; 662 heap [k] = w;
617 ((W)heap [k])->active = k + 1; 663 ((W)heap [k])->active = k + 1;
618
619} 664}
620 665
621void inline_speed 666void inline_speed
622downheap (WT *heap, int N, int k) 667downheap (WT *heap, int N, int k)
623{ 668{
624 WT w = heap [k]; 669 WT w = heap [k];
625 670
626 while (k < (N >> 1)) 671 for (;;)
627 { 672 {
628 int j = k << 1; 673 int c = (k << 1) + 1;
629 674
630 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 675 if (c >= N)
631 ++j;
632
633 if (w->at <= heap [j]->at)
634 break; 676 break;
635 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
636 heap [k] = heap [j]; 684 heap [k] = heap [c];
637 ((W)heap [k])->active = k + 1; 685 ((W)heap [k])->active = k + 1;
686
638 k = j; 687 k = c;
639 } 688 }
640 689
641 heap [k] = w; 690 heap [k] = w;
642 ((W)heap [k])->active = k + 1; 691 ((W)heap [k])->active = k + 1;
643} 692}
… …
725 for (signum = signalmax; signum--; ) 774 for (signum = signalmax; signum--; )
726 if (signals [signum].gotsig) 775 if (signals [signum].gotsig)
727 ev_feed_signal_event (EV_A_ signum + 1); 776 ev_feed_signal_event (EV_A_ signum + 1);
728} 777}
729 778
730void inline_size 779void inline_speed
731fd_intern (int fd) 780fd_intern (int fd)
732{ 781{
733#ifdef _WIN32 782#ifdef _WIN32
734 int arg = 1; 783 int arg = 1;
735 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 784 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
750 ev_unref (EV_A); /* child watcher should not keep loop alive */ 799 ev_unref (EV_A); /* child watcher should not keep loop alive */
751} 800}
752 801
753/*****************************************************************************/ 802/*****************************************************************************/
754 803
755static ev_child *childs [EV_PID_HASHSIZE]; 804static WL childs [EV_PID_HASHSIZE];
756 805
757#ifndef _WIN32 806#ifndef _WIN32
758 807
759static ev_signal childev; 808static ev_signal childev;
760 809
… …
764 ev_child *w; 813 ev_child *w;
765 814
766 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)
767 if (w->pid == pid || !w->pid) 816 if (w->pid == pid || !w->pid)
768 { 817 {
769 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 818 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
770 w->rpid = pid; 819 w->rpid = pid;
771 w->rstatus = status; 820 w->rstatus = status;
772 ev_feed_event (EV_A_ (W)w, EV_CHILD); 821 ev_feed_event (EV_A_ (W)w, EV_CHILD);
773 } 822 }
774} 823}
775 824
776#ifndef WCONTINUED 825#ifndef WCONTINUED
… …
886ev_backend (EV_P) 935ev_backend (EV_P)
887{ 936{
888 return backend; 937 return backend;
889} 938}
890 939
940unsigned int
941ev_loop_count (EV_P)
942{
943 return loop_count;
944}
945
891static void noinline 946static void noinline
892loop_init (EV_P_ unsigned int flags) 947loop_init (EV_P_ unsigned int flags)
893{ 948{
894 if (!backend) 949 if (!backend)
895 { 950 {
… …
975#if EV_USE_SELECT 1030#if EV_USE_SELECT
976 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1031 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
977#endif 1032#endif
978 1033
979 for (i = NUMPRI; i--; ) 1034 for (i = NUMPRI; i--; )
1035 {
980 array_free (pending, [i]); 1036 array_free (pending, [i]);
1037#if EV_IDLE_ENABLE
1038 array_free (idle, [i]);
1039#endif
1040 }
981 1041
982 /* have to use the microsoft-never-gets-it-right macro */ 1042 /* have to use the microsoft-never-gets-it-right macro */
983 array_free (fdchange, EMPTY0); 1043 array_free (fdchange, EMPTY);
984 array_free (timer, EMPTY0); 1044 array_free (timer, EMPTY);
985#if EV_PERIODIC_ENABLE 1045#if EV_PERIODIC_ENABLE
986 array_free (periodic, EMPTY0); 1046 array_free (periodic, EMPTY);
987#endif 1047#endif
988 array_free (idle, EMPTY0);
989 array_free (prepare, EMPTY0); 1048 array_free (prepare, EMPTY);
990 array_free (check, EMPTY0); 1049 array_free (check, EMPTY);
991 1050
992 backend = 0; 1051 backend = 0;
993} 1052}
994 1053
995void inline_size infy_fork (EV_P); 1054void inline_size infy_fork (EV_P);
… …
1131 postfork = 1; 1190 postfork = 1;
1132} 1191}
1133 1192
1134/*****************************************************************************/ 1193/*****************************************************************************/
1135 1194
1136int inline_size 1195void
1137any_pending (EV_P) 1196ev_invoke (EV_P_ void *w, int revents)
1138{ 1197{
1139 int pri; 1198 EV_CB_INVOKE ((W)w, revents);
1140
1141 for (pri = NUMPRI; pri--; )
1142 if (pendingcnt [pri])
1143 return 1;
1144
1145 return 0;
1146} 1199}
1147 1200
1148void inline_speed 1201void inline_speed
1149call_pending (EV_P) 1202call_pending (EV_P)
1150{ 1203{
… …
1168void inline_size 1221void inline_size
1169timers_reify (EV_P) 1222timers_reify (EV_P)
1170{ 1223{
1171 while (timercnt && ((WT)timers [0])->at <= mn_now) 1224 while (timercnt && ((WT)timers [0])->at <= mn_now)
1172 { 1225 {
1173 ev_timer *w = timers [0]; 1226 ev_timer *w = (ev_timer *)timers [0];
1174 1227
1175 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1228 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1176 1229
1177 /* first reschedule or stop timer */ 1230 /* first reschedule or stop timer */
1178 if (w->repeat) 1231 if (w->repeat)
… …
1181 1234
1182 ((WT)w)->at += w->repeat; 1235 ((WT)w)->at += w->repeat;
1183 if (((WT)w)->at < mn_now) 1236 if (((WT)w)->at < mn_now)
1184 ((WT)w)->at = mn_now; 1237 ((WT)w)->at = mn_now;
1185 1238
1186 downheap ((WT *)timers, timercnt, 0); 1239 downheap (timers, timercnt, 0);
1187 } 1240 }
1188 else 1241 else
1189 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1242 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1190 1243
1191 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1244 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1196void inline_size 1249void inline_size
1197periodics_reify (EV_P) 1250periodics_reify (EV_P)
1198{ 1251{
1199 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1252 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1200 { 1253 {
1201 ev_periodic *w = periodics [0]; 1254 ev_periodic *w = (ev_periodic *)periodics [0];
1202 1255
1203 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1256 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1204 1257
1205 /* first reschedule or stop timer */ 1258 /* first reschedule or stop timer */
1206 if (w->reschedule_cb) 1259 if (w->reschedule_cb)
1207 { 1260 {
1208 ((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);
1209 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));
1210 downheap ((WT *)periodics, periodiccnt, 0); 1263 downheap (periodics, periodiccnt, 0);
1211 } 1264 }
1212 else if (w->interval) 1265 else if (w->interval)
1213 { 1266 {
1214 ((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;
1215 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));
1216 downheap ((WT *)periodics, periodiccnt, 0); 1270 downheap (periodics, periodiccnt, 0);
1217 } 1271 }
1218 else 1272 else
1219 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1273 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1220 1274
1221 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1275 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1228 int i; 1282 int i;
1229 1283
1230 /* adjust periodics after time jump */ 1284 /* adjust periodics after time jump */
1231 for (i = 0; i < periodiccnt; ++i) 1285 for (i = 0; i < periodiccnt; ++i)
1232 { 1286 {
1233 ev_periodic *w = periodics [i]; 1287 ev_periodic *w = (ev_periodic *)periodics [i];
1234 1288
1235 if (w->reschedule_cb) 1289 if (w->reschedule_cb)
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1290 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1237 else if (w->interval) 1291 else if (w->interval)
1238 ((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;
1239 } 1293 }
1240 1294
1241 /* now rebuild the heap */ 1295 /* now rebuild the heap */
1242 for (i = periodiccnt >> 1; i--; ) 1296 for (i = periodiccnt >> 1; i--; )
1243 downheap ((WT *)periodics, periodiccnt, i); 1297 downheap (periodics, periodiccnt, i);
1244} 1298}
1245#endif 1299#endif
1246 1300
1301#if EV_IDLE_ENABLE
1247int inline_size 1302void inline_size
1248time_update_monotonic (EV_P) 1303idle_reify (EV_P)
1249{ 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
1250 mn_now = get_clock (); 1334 mn_now = get_clock ();
1251 1335
1336 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1337 /* interpolate in the meantime */
1252 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1338 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1253 { 1339 {
1254 ev_rt_now = rtmn_diff + mn_now; 1340 ev_rt_now = rtmn_diff + mn_now;
1255 return 0; 1341 return;
1256 } 1342 }
1257 else 1343
1258 {
1259 now_floor = mn_now; 1344 now_floor = mn_now;
1260 ev_rt_now = ev_time (); 1345 ev_rt_now = ev_time ();
1261 return 1;
1262 }
1263}
1264 1346
1265void inline_size 1347 /* loop a few times, before making important decisions.
1266time_update (EV_P) 1348 * on the choice of "4": one iteration isn't enough,
1267{ 1349 * in case we get preempted during the calls to
1268 int i; 1350 * ev_time and get_clock. a second call is almost guaranteed
1269 1351 * to succeed in that case, though. and looping a few more times
1270#if EV_USE_MONOTONIC 1352 * doesn't hurt either as we only do this on time-jumps or
1271 if (expect_true (have_monotonic)) 1353 * in the unlikely event of having been preempted here.
1272 { 1354 */
1273 if (time_update_monotonic (EV_A)) 1355 for (i = 4; --i; )
1274 { 1356 {
1275 ev_tstamp odiff = rtmn_diff;
1276
1277 /* loop a few times, before making important decisions.
1278 * on the choice of "4": one iteration isn't enough,
1279 * in case we get preempted during the calls to
1280 * ev_time and get_clock. a second call is almost guaranteed
1281 * to succeed in that case, though. and looping a few more times
1282 * doesn't hurt either as we only do this on time-jumps or
1283 * in the unlikely event of having been preempted here.
1284 */
1285 for (i = 4; --i; )
1286 {
1287 rtmn_diff = ev_rt_now - mn_now; 1357 rtmn_diff = ev_rt_now - mn_now;
1288 1358
1289 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1359 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1290 return; /* all is well */ 1360 return; /* all is well */
1291 1361
1292 ev_rt_now = ev_time (); 1362 ev_rt_now = ev_time ();
1293 mn_now = get_clock (); 1363 mn_now = get_clock ();
1294 now_floor = mn_now; 1364 now_floor = mn_now;
1295 } 1365 }
1296 1366
1297# if EV_PERIODIC_ENABLE 1367# if EV_PERIODIC_ENABLE
1298 periodics_reschedule (EV_A); 1368 periodics_reschedule (EV_A);
1299# endif 1369# endif
1300 /* no timer adjustment, as the monotonic clock doesn't jump */ 1370 /* no timer adjustment, as the monotonic clock doesn't jump */
1301 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1371 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1302 }
1303 } 1372 }
1304 else 1373 else
1305#endif 1374#endif
1306 { 1375 {
1307 ev_rt_now = ev_time (); 1376 ev_rt_now = ev_time ();
1308 1377
1309 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))
1310 { 1379 {
1311#if EV_PERIODIC_ENABLE 1380#if EV_PERIODIC_ENABLE
1312 periodics_reschedule (EV_A); 1381 periodics_reschedule (EV_A);
1313#endif 1382#endif
1314
1315 /* 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 */
1316 for (i = 0; i < timercnt; ++i) 1384 for (i = 0; i < timercnt; ++i)
1317 ((WT)timers [i])->at += ev_rt_now - mn_now; 1385 ((WT)timers [i])->at += ev_rt_now - mn_now;
1318 } 1386 }
1319 1387
… …
1342 ? EVUNLOOP_ONE 1410 ? EVUNLOOP_ONE
1343 : EVUNLOOP_CANCEL; 1411 : EVUNLOOP_CANCEL;
1344 1412
1345 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1413 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1346 1414
1347 for (;;) 1415 do
1348 { 1416 {
1349#ifndef _WIN32 1417#ifndef _WIN32
1350 if (expect_false (curpid)) /* penalise the forking check even more */ 1418 if (expect_false (curpid)) /* penalise the forking check even more */
1351 if (expect_false (getpid () != curpid)) 1419 if (expect_false (getpid () != curpid))
1352 { 1420 {
… …
1363 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1431 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1364 call_pending (EV_A); 1432 call_pending (EV_A);
1365 } 1433 }
1366#endif 1434#endif
1367 1435
1368 /* queue check watchers (and execute them) */ 1436 /* queue prepare watchers (and execute them) */
1369 if (expect_false (preparecnt)) 1437 if (expect_false (preparecnt))
1370 { 1438 {
1371 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1439 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1372 call_pending (EV_A); 1440 call_pending (EV_A);
1373 } 1441 }
… …
1384 1452
1385 /* calculate blocking time */ 1453 /* calculate blocking time */
1386 { 1454 {
1387 ev_tstamp block; 1455 ev_tstamp block;
1388 1456
1389 if (flags & EVLOOP_NONBLOCK || idlecnt) 1457 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1390 block = 0.; /* do not block at all */ 1458 block = 0.; /* do not block at all */
1391 else 1459 else
1392 { 1460 {
1393 /* update time to cancel out callback processing overhead */ 1461 /* update time to cancel out callback processing overhead */
1394#if EV_USE_MONOTONIC
1395 if (expect_true (have_monotonic))
1396 time_update_monotonic (EV_A); 1462 time_update (EV_A_ 1e100);
1397 else
1398#endif
1399 {
1400 ev_rt_now = ev_time ();
1401 mn_now = ev_rt_now;
1402 }
1403 1463
1404 block = MAX_BLOCKTIME; 1464 block = MAX_BLOCKTIME;
1405 1465
1406 if (timercnt) 1466 if (timercnt)
1407 { 1467 {
… …
1418#endif 1478#endif
1419 1479
1420 if (expect_false (block < 0.)) block = 0.; 1480 if (expect_false (block < 0.)) block = 0.;
1421 } 1481 }
1422 1482
1483 ++loop_count;
1423 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);
1424 } 1488 }
1425
1426 /* update ev_rt_now, do magic */
1427 time_update (EV_A);
1428 1489
1429 /* queue pending timers and reschedule them */ 1490 /* queue pending timers and reschedule them */
1430 timers_reify (EV_A); /* relative timers called last */ 1491 timers_reify (EV_A); /* relative timers called last */
1431#if EV_PERIODIC_ENABLE 1492#if EV_PERIODIC_ENABLE
1432 periodics_reify (EV_A); /* absolute timers called first */ 1493 periodics_reify (EV_A); /* absolute timers called first */
1433#endif 1494#endif
1434 1495
1496#if EV_IDLE_ENABLE
1435 /* queue idle watchers unless other events are pending */ 1497 /* queue idle watchers unless other events are pending */
1436 if (idlecnt && !any_pending (EV_A)) 1498 idle_reify (EV_A);
1437 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1499#endif
1438 1500
1439 /* queue check watchers, to be executed first */ 1501 /* queue check watchers, to be executed first */
1440 if (expect_false (checkcnt)) 1502 if (expect_false (checkcnt))
1441 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1503 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1442 1504
1443 call_pending (EV_A); 1505 call_pending (EV_A);
1444 1506
1445 if (expect_false (loop_done))
1446 break;
1447 } 1507 }
1508 while (expect_true (activecnt && !loop_done));
1448 1509
1449 if (loop_done == EVUNLOOP_ONE) 1510 if (loop_done == EVUNLOOP_ONE)
1450 loop_done = EVUNLOOP_CANCEL; 1511 loop_done = EVUNLOOP_CANCEL;
1451} 1512}
1452 1513
… …
1479 head = &(*head)->next; 1540 head = &(*head)->next;
1480 } 1541 }
1481} 1542}
1482 1543
1483void inline_speed 1544void inline_speed
1484ev_clear_pending (EV_P_ W w) 1545clear_pending (EV_P_ W w)
1485{ 1546{
1486 if (w->pending) 1547 if (w->pending)
1487 { 1548 {
1488 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1549 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1489 w->pending = 0; 1550 w->pending = 0;
1490 } 1551 }
1491} 1552}
1492 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
1493void inline_speed 1580void inline_speed
1494ev_start (EV_P_ W w, int active) 1581ev_start (EV_P_ W w, int active)
1495{ 1582{
1496 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1583 pri_adjust (EV_A_ w);
1497 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1498
1499 w->active = active; 1584 w->active = active;
1500 ev_ref (EV_A); 1585 ev_ref (EV_A);
1501} 1586}
1502 1587
1503void inline_size 1588void inline_size
… …
1507 w->active = 0; 1592 w->active = 0;
1508} 1593}
1509 1594
1510/*****************************************************************************/ 1595/*****************************************************************************/
1511 1596
1512void 1597void noinline
1513ev_io_start (EV_P_ ev_io *w) 1598ev_io_start (EV_P_ ev_io *w)
1514{ 1599{
1515 int fd = w->fd; 1600 int fd = w->fd;
1516 1601
1517 if (expect_false (ev_is_active (w))) 1602 if (expect_false (ev_is_active (w)))
… …
1519 1604
1520 assert (("ev_io_start called with negative fd", fd >= 0)); 1605 assert (("ev_io_start called with negative fd", fd >= 0));
1521 1606
1522 ev_start (EV_A_ (W)w, 1); 1607 ev_start (EV_A_ (W)w, 1);
1523 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1608 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1524 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1609 wlist_add (&anfds[fd].head, (WL)w);
1525 1610
1526 fd_change (EV_A_ fd); 1611 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1612 w->events &= ~EV_IOFDSET;
1527} 1613}
1528 1614
1529void 1615void noinline
1530ev_io_stop (EV_P_ ev_io *w) 1616ev_io_stop (EV_P_ ev_io *w)
1531{ 1617{
1532 ev_clear_pending (EV_A_ (W)w); 1618 clear_pending (EV_A_ (W)w);
1533 if (expect_false (!ev_is_active (w))) 1619 if (expect_false (!ev_is_active (w)))
1534 return; 1620 return;
1535 1621
1536 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));
1537 1623
1538 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1624 wlist_del (&anfds[w->fd].head, (WL)w);
1539 ev_stop (EV_A_ (W)w); 1625 ev_stop (EV_A_ (W)w);
1540 1626
1541 fd_change (EV_A_ w->fd); 1627 fd_change (EV_A_ w->fd, 1);
1542} 1628}
1543 1629
1544void 1630void noinline
1545ev_timer_start (EV_P_ ev_timer *w) 1631ev_timer_start (EV_P_ ev_timer *w)
1546{ 1632{
1547 if (expect_false (ev_is_active (w))) 1633 if (expect_false (ev_is_active (w)))
1548 return; 1634 return;
1549 1635
1550 ((WT)w)->at += mn_now; 1636 ((WT)w)->at += mn_now;
1551 1637
1552 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.));
1553 1639
1554 ev_start (EV_A_ (W)w, ++timercnt); 1640 ev_start (EV_A_ (W)w, ++timercnt);
1555 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1641 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1556 timers [timercnt - 1] = w; 1642 timers [timercnt - 1] = (WT)w;
1557 upheap ((WT *)timers, timercnt - 1); 1643 upheap (timers, timercnt - 1);
1558 1644
1559 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1645 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1560} 1646}
1561 1647
1562void 1648void noinline
1563ev_timer_stop (EV_P_ ev_timer *w) 1649ev_timer_stop (EV_P_ ev_timer *w)
1564{ 1650{
1565 ev_clear_pending (EV_A_ (W)w); 1651 clear_pending (EV_A_ (W)w);
1566 if (expect_false (!ev_is_active (w))) 1652 if (expect_false (!ev_is_active (w)))
1567 return; 1653 return;
1568 1654
1569 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1655 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1570 1656
1571 { 1657 {
1572 int active = ((W)w)->active; 1658 int active = ((W)w)->active;
1573 1659
1574 if (expect_true (--active < --timercnt)) 1660 if (expect_true (--active < --timercnt))
1575 { 1661 {
1576 timers [active] = timers [timercnt]; 1662 timers [active] = timers [timercnt];
1577 adjustheap ((WT *)timers, timercnt, active); 1663 adjustheap (timers, timercnt, active);
1578 } 1664 }
1579 } 1665 }
1580 1666
1581 ((WT)w)->at -= mn_now; 1667 ((WT)w)->at -= mn_now;
1582 1668
1583 ev_stop (EV_A_ (W)w); 1669 ev_stop (EV_A_ (W)w);
1584} 1670}
1585 1671
1586void 1672void noinline
1587ev_timer_again (EV_P_ ev_timer *w) 1673ev_timer_again (EV_P_ ev_timer *w)
1588{ 1674{
1589 if (ev_is_active (w)) 1675 if (ev_is_active (w))
1590 { 1676 {
1591 if (w->repeat) 1677 if (w->repeat)
1592 { 1678 {
1593 ((WT)w)->at = mn_now + w->repeat; 1679 ((WT)w)->at = mn_now + w->repeat;
1594 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1680 adjustheap (timers, timercnt, ((W)w)->active - 1);
1595 } 1681 }
1596 else 1682 else
1597 ev_timer_stop (EV_A_ w); 1683 ev_timer_stop (EV_A_ w);
1598 } 1684 }
1599 else if (w->repeat) 1685 else if (w->repeat)
… …
1602 ev_timer_start (EV_A_ w); 1688 ev_timer_start (EV_A_ w);
1603 } 1689 }
1604} 1690}
1605 1691
1606#if EV_PERIODIC_ENABLE 1692#if EV_PERIODIC_ENABLE
1607void 1693void noinline
1608ev_periodic_start (EV_P_ ev_periodic *w) 1694ev_periodic_start (EV_P_ ev_periodic *w)
1609{ 1695{
1610 if (expect_false (ev_is_active (w))) 1696 if (expect_false (ev_is_active (w)))
1611 return; 1697 return;
1612 1698
… …
1614 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1700 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1615 else if (w->interval) 1701 else if (w->interval)
1616 { 1702 {
1617 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.));
1618 /* 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 */
1619 ((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;
1620 } 1706 }
1707 else
1708 ((WT)w)->at = w->offset;
1621 1709
1622 ev_start (EV_A_ (W)w, ++periodiccnt); 1710 ev_start (EV_A_ (W)w, ++periodiccnt);
1623 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1711 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1624 periodics [periodiccnt - 1] = w; 1712 periodics [periodiccnt - 1] = (WT)w;
1625 upheap ((WT *)periodics, periodiccnt - 1); 1713 upheap (periodics, periodiccnt - 1);
1626 1714
1627 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1715 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1628} 1716}
1629 1717
1630void 1718void noinline
1631ev_periodic_stop (EV_P_ ev_periodic *w) 1719ev_periodic_stop (EV_P_ ev_periodic *w)
1632{ 1720{
1633 ev_clear_pending (EV_A_ (W)w); 1721 clear_pending (EV_A_ (W)w);
1634 if (expect_false (!ev_is_active (w))) 1722 if (expect_false (!ev_is_active (w)))
1635 return; 1723 return;
1636 1724
1637 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1725 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1638 1726
1639 { 1727 {
1640 int active = ((W)w)->active; 1728 int active = ((W)w)->active;
1641 1729
1642 if (expect_true (--active < --periodiccnt)) 1730 if (expect_true (--active < --periodiccnt))
1643 { 1731 {
1644 periodics [active] = periodics [periodiccnt]; 1732 periodics [active] = periodics [periodiccnt];
1645 adjustheap ((WT *)periodics, periodiccnt, active); 1733 adjustheap (periodics, periodiccnt, active);
1646 } 1734 }
1647 } 1735 }
1648 1736
1649 ev_stop (EV_A_ (W)w); 1737 ev_stop (EV_A_ (W)w);
1650} 1738}
1651 1739
1652void 1740void noinline
1653ev_periodic_again (EV_P_ ev_periodic *w) 1741ev_periodic_again (EV_P_ ev_periodic *w)
1654{ 1742{
1655 /* TODO: use adjustheap and recalculation */ 1743 /* TODO: use adjustheap and recalculation */
1656 ev_periodic_stop (EV_A_ w); 1744 ev_periodic_stop (EV_A_ w);
1657 ev_periodic_start (EV_A_ w); 1745 ev_periodic_start (EV_A_ w);
… …
1660 1748
1661#ifndef SA_RESTART 1749#ifndef SA_RESTART
1662# define SA_RESTART 0 1750# define SA_RESTART 0
1663#endif 1751#endif
1664 1752
1665void 1753void noinline
1666ev_signal_start (EV_P_ ev_signal *w) 1754ev_signal_start (EV_P_ ev_signal *w)
1667{ 1755{
1668#if EV_MULTIPLICITY 1756#if EV_MULTIPLICITY
1669 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));
1670#endif 1758#endif
1671 if (expect_false (ev_is_active (w))) 1759 if (expect_false (ev_is_active (w)))
1672 return; 1760 return;
1673 1761
1674 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));
1675 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
1676 ev_start (EV_A_ (W)w, 1); 1778 ev_start (EV_A_ (W)w, 1);
1677 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1678 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1779 wlist_add (&signals [w->signum - 1].head, (WL)w);
1679 1780
1680 if (!((WL)w)->next) 1781 if (!((WL)w)->next)
1681 { 1782 {
1682#if _WIN32 1783#if _WIN32
1683 signal (w->signum, sighandler); 1784 signal (w->signum, sighandler);
… …
1689 sigaction (w->signum, &sa, 0); 1790 sigaction (w->signum, &sa, 0);
1690#endif 1791#endif
1691 } 1792 }
1692} 1793}
1693 1794
1694void 1795void noinline
1695ev_signal_stop (EV_P_ ev_signal *w) 1796ev_signal_stop (EV_P_ ev_signal *w)
1696{ 1797{
1697 ev_clear_pending (EV_A_ (W)w); 1798 clear_pending (EV_A_ (W)w);
1698 if (expect_false (!ev_is_active (w))) 1799 if (expect_false (!ev_is_active (w)))
1699 return; 1800 return;
1700 1801
1701 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1802 wlist_del (&signals [w->signum - 1].head, (WL)w);
1702 ev_stop (EV_A_ (W)w); 1803 ev_stop (EV_A_ (W)w);
1703 1804
1704 if (!signals [w->signum - 1].head) 1805 if (!signals [w->signum - 1].head)
1705 signal (w->signum, SIG_DFL); 1806 signal (w->signum, SIG_DFL);
1706} 1807}
… …
1713#endif 1814#endif
1714 if (expect_false (ev_is_active (w))) 1815 if (expect_false (ev_is_active (w)))
1715 return; 1816 return;
1716 1817
1717 ev_start (EV_A_ (W)w, 1); 1818 ev_start (EV_A_ (W)w, 1);
1718 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1819 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1719} 1820}
1720 1821
1721void 1822void
1722ev_child_stop (EV_P_ ev_child *w) 1823ev_child_stop (EV_P_ ev_child *w)
1723{ 1824{
1724 ev_clear_pending (EV_A_ (W)w); 1825 clear_pending (EV_A_ (W)w);
1725 if (expect_false (!ev_is_active (w))) 1826 if (expect_false (!ev_is_active (w)))
1726 return; 1827 return;
1727 1828
1728 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1829 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1729 ev_stop (EV_A_ (W)w); 1830 ev_stop (EV_A_ (W)w);
1730} 1831}
1731 1832
1732#if EV_STAT_ENABLE 1833#if EV_STAT_ENABLE
1733 1834
… …
1965} 2066}
1966 2067
1967void 2068void
1968ev_stat_stop (EV_P_ ev_stat *w) 2069ev_stat_stop (EV_P_ ev_stat *w)
1969{ 2070{
1970 ev_clear_pending (EV_A_ (W)w); 2071 clear_pending (EV_A_ (W)w);
1971 if (expect_false (!ev_is_active (w))) 2072 if (expect_false (!ev_is_active (w)))
1972 return; 2073 return;
1973 2074
1974#if EV_USE_INOTIFY 2075#if EV_USE_INOTIFY
1975 infy_del (EV_A_ w); 2076 infy_del (EV_A_ w);
… …
1978 2079
1979 ev_stop (EV_A_ (W)w); 2080 ev_stop (EV_A_ (W)w);
1980} 2081}
1981#endif 2082#endif
1982 2083
2084#if EV_IDLE_ENABLE
1983void 2085void
1984ev_idle_start (EV_P_ ev_idle *w) 2086ev_idle_start (EV_P_ ev_idle *w)
1985{ 2087{
1986 if (expect_false (ev_is_active (w))) 2088 if (expect_false (ev_is_active (w)))
1987 return; 2089 return;
1988 2090
2091 pri_adjust (EV_A_ (W)w);
2092
2093 {
2094 int active = ++idlecnt [ABSPRI (w)];
2095
2096 ++idleall;
1989 ev_start (EV_A_ (W)w, ++idlecnt); 2097 ev_start (EV_A_ (W)w, active);
2098
1990 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2099 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1991 idles [idlecnt - 1] = w; 2100 idles [ABSPRI (w)][active - 1] = w;
2101 }
1992} 2102}
1993 2103
1994void 2104void
1995ev_idle_stop (EV_P_ ev_idle *w) 2105ev_idle_stop (EV_P_ ev_idle *w)
1996{ 2106{
1997 ev_clear_pending (EV_A_ (W)w); 2107 clear_pending (EV_A_ (W)w);
1998 if (expect_false (!ev_is_active (w))) 2108 if (expect_false (!ev_is_active (w)))
1999 return; 2109 return;
2000 2110
2001 { 2111 {
2002 int active = ((W)w)->active; 2112 int active = ((W)w)->active;
2003 idles [active - 1] = idles [--idlecnt]; 2113
2114 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2004 ((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;
2005 } 2119 }
2006
2007 ev_stop (EV_A_ (W)w);
2008} 2120}
2121#endif
2009 2122
2010void 2123void
2011ev_prepare_start (EV_P_ ev_prepare *w) 2124ev_prepare_start (EV_P_ ev_prepare *w)
2012{ 2125{
2013 if (expect_false (ev_is_active (w))) 2126 if (expect_false (ev_is_active (w)))
… …
2019} 2132}
2020 2133
2021void 2134void
2022ev_prepare_stop (EV_P_ ev_prepare *w) 2135ev_prepare_stop (EV_P_ ev_prepare *w)
2023{ 2136{
2024 ev_clear_pending (EV_A_ (W)w); 2137 clear_pending (EV_A_ (W)w);
2025 if (expect_false (!ev_is_active (w))) 2138 if (expect_false (!ev_is_active (w)))
2026 return; 2139 return;
2027 2140
2028 { 2141 {
2029 int active = ((W)w)->active; 2142 int active = ((W)w)->active;
… …
2046} 2159}
2047 2160
2048void 2161void
2049ev_check_stop (EV_P_ ev_check *w) 2162ev_check_stop (EV_P_ ev_check *w)
2050{ 2163{
2051 ev_clear_pending (EV_A_ (W)w); 2164 clear_pending (EV_A_ (W)w);
2052 if (expect_false (!ev_is_active (w))) 2165 if (expect_false (!ev_is_active (w)))
2053 return; 2166 return;
2054 2167
2055 { 2168 {
2056 int active = ((W)w)->active; 2169 int active = ((W)w)->active;
… …
2098} 2211}
2099 2212
2100void 2213void
2101ev_embed_stop (EV_P_ ev_embed *w) 2214ev_embed_stop (EV_P_ ev_embed *w)
2102{ 2215{
2103 ev_clear_pending (EV_A_ (W)w); 2216 clear_pending (EV_A_ (W)w);
2104 if (expect_false (!ev_is_active (w))) 2217 if (expect_false (!ev_is_active (w)))
2105 return; 2218 return;
2106 2219
2107 ev_io_stop (EV_A_ &w->io); 2220 ev_io_stop (EV_A_ &w->io);
2108 2221
… …
2123} 2236}
2124 2237
2125void 2238void
2126ev_fork_stop (EV_P_ ev_fork *w) 2239ev_fork_stop (EV_P_ ev_fork *w)
2127{ 2240{
2128 ev_clear_pending (EV_A_ (W)w); 2241 clear_pending (EV_A_ (W)w);
2129 if (expect_false (!ev_is_active (w))) 2242 if (expect_false (!ev_is_active (w)))
2130 return; 2243 return;
2131 2244
2132 { 2245 {
2133 int active = ((W)w)->active; 2246 int active = ((W)w)->active;

Diff Legend

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