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

Comparing libev/ev.c (file contents):
Revision 1.157 by root, Wed Nov 28 20:58:32 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 {
… …
904 ev_rt_now = ev_time (); 959 ev_rt_now = ev_time ();
905 mn_now = get_clock (); 960 mn_now = get_clock ();
906 now_floor = mn_now; 961 now_floor = mn_now;
907 rtmn_diff = ev_rt_now - mn_now; 962 rtmn_diff = ev_rt_now - mn_now;
908 963
964 /* pid check not overridable via env */
965#ifndef _WIN32
966 if (flags & EVFLAG_FORKCHECK)
967 curpid = getpid ();
968#endif
969
909 if (!(flags & EVFLAG_NOENV) 970 if (!(flags & EVFLAG_NOENV)
910 && !enable_secure () 971 && !enable_secure ()
911 && getenv ("LIBEV_FLAGS")) 972 && getenv ("LIBEV_FLAGS"))
912 flags = atoi (getenv ("LIBEV_FLAGS")); 973 flags = atoi (getenv ("LIBEV_FLAGS"));
913 974
… …
969#if EV_USE_SELECT 1030#if EV_USE_SELECT
970 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1031 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
971#endif 1032#endif
972 1033
973 for (i = NUMPRI; i--; ) 1034 for (i = NUMPRI; i--; )
1035 {
974 array_free (pending, [i]); 1036 array_free (pending, [i]);
1037#if EV_IDLE_ENABLE
1038 array_free (idle, [i]);
1039#endif
1040 }
975 1041
976 /* have to use the microsoft-never-gets-it-right macro */ 1042 /* have to use the microsoft-never-gets-it-right macro */
977 array_free (fdchange, EMPTY0); 1043 array_free (fdchange, EMPTY);
978 array_free (timer, EMPTY0); 1044 array_free (timer, EMPTY);
979#if EV_PERIODIC_ENABLE 1045#if EV_PERIODIC_ENABLE
980 array_free (periodic, EMPTY0); 1046 array_free (periodic, EMPTY);
981#endif 1047#endif
982 array_free (idle, EMPTY0);
983 array_free (prepare, EMPTY0); 1048 array_free (prepare, EMPTY);
984 array_free (check, EMPTY0); 1049 array_free (check, EMPTY);
985 1050
986 backend = 0; 1051 backend = 0;
987} 1052}
988 1053
989void inline_size infy_fork (EV_P); 1054void inline_size infy_fork (EV_P);
… …
1125 postfork = 1; 1190 postfork = 1;
1126} 1191}
1127 1192
1128/*****************************************************************************/ 1193/*****************************************************************************/
1129 1194
1130int inline_size 1195void
1131any_pending (EV_P) 1196ev_invoke (EV_P_ void *w, int revents)
1132{ 1197{
1133 int pri; 1198 EV_CB_INVOKE ((W)w, revents);
1134
1135 for (pri = NUMPRI; pri--; )
1136 if (pendingcnt [pri])
1137 return 1;
1138
1139 return 0;
1140} 1199}
1141 1200
1142void inline_speed 1201void inline_speed
1143call_pending (EV_P) 1202call_pending (EV_P)
1144{ 1203{
… …
1162void inline_size 1221void inline_size
1163timers_reify (EV_P) 1222timers_reify (EV_P)
1164{ 1223{
1165 while (timercnt && ((WT)timers [0])->at <= mn_now) 1224 while (timercnt && ((WT)timers [0])->at <= mn_now)
1166 { 1225 {
1167 ev_timer *w = timers [0]; 1226 ev_timer *w = (ev_timer *)timers [0];
1168 1227
1169 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1228 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1170 1229
1171 /* first reschedule or stop timer */ 1230 /* first reschedule or stop timer */
1172 if (w->repeat) 1231 if (w->repeat)
… …
1175 1234
1176 ((WT)w)->at += w->repeat; 1235 ((WT)w)->at += w->repeat;
1177 if (((WT)w)->at < mn_now) 1236 if (((WT)w)->at < mn_now)
1178 ((WT)w)->at = mn_now; 1237 ((WT)w)->at = mn_now;
1179 1238
1180 downheap ((WT *)timers, timercnt, 0); 1239 downheap (timers, timercnt, 0);
1181 } 1240 }
1182 else 1241 else
1183 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1242 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1184 1243
1185 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1244 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1190void inline_size 1249void inline_size
1191periodics_reify (EV_P) 1250periodics_reify (EV_P)
1192{ 1251{
1193 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1252 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1194 { 1253 {
1195 ev_periodic *w = periodics [0]; 1254 ev_periodic *w = (ev_periodic *)periodics [0];
1196 1255
1197 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1256 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1198 1257
1199 /* first reschedule or stop timer */ 1258 /* first reschedule or stop timer */
1200 if (w->reschedule_cb) 1259 if (w->reschedule_cb)
1201 { 1260 {
1202 ((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);
1203 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));
1204 downheap ((WT *)periodics, periodiccnt, 0); 1263 downheap (periodics, periodiccnt, 0);
1205 } 1264 }
1206 else if (w->interval) 1265 else if (w->interval)
1207 { 1266 {
1208 ((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;
1209 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));
1210 downheap ((WT *)periodics, periodiccnt, 0); 1270 downheap (periodics, periodiccnt, 0);
1211 } 1271 }
1212 else 1272 else
1213 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1273 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1214 1274
1215 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1275 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1222 int i; 1282 int i;
1223 1283
1224 /* adjust periodics after time jump */ 1284 /* adjust periodics after time jump */
1225 for (i = 0; i < periodiccnt; ++i) 1285 for (i = 0; i < periodiccnt; ++i)
1226 { 1286 {
1227 ev_periodic *w = periodics [i]; 1287 ev_periodic *w = (ev_periodic *)periodics [i];
1228 1288
1229 if (w->reschedule_cb) 1289 if (w->reschedule_cb)
1230 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1290 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1231 else if (w->interval) 1291 else if (w->interval)
1232 ((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;
1233 } 1293 }
1234 1294
1235 /* now rebuild the heap */ 1295 /* now rebuild the heap */
1236 for (i = periodiccnt >> 1; i--; ) 1296 for (i = periodiccnt >> 1; i--; )
1237 downheap ((WT *)periodics, periodiccnt, i); 1297 downheap (periodics, periodiccnt, i);
1238} 1298}
1239#endif 1299#endif
1240 1300
1301#if EV_IDLE_ENABLE
1241int inline_size 1302void inline_size
1242time_update_monotonic (EV_P) 1303idle_reify (EV_P)
1243{ 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
1244 mn_now = get_clock (); 1334 mn_now = get_clock ();
1245 1335
1336 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1337 /* interpolate in the meantime */
1246 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1338 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1247 { 1339 {
1248 ev_rt_now = rtmn_diff + mn_now; 1340 ev_rt_now = rtmn_diff + mn_now;
1249 return 0; 1341 return;
1250 } 1342 }
1251 else 1343
1252 {
1253 now_floor = mn_now; 1344 now_floor = mn_now;
1254 ev_rt_now = ev_time (); 1345 ev_rt_now = ev_time ();
1255 return 1;
1256 }
1257}
1258 1346
1259void inline_size 1347 /* loop a few times, before making important decisions.
1260time_update (EV_P) 1348 * on the choice of "4": one iteration isn't enough,
1261{ 1349 * in case we get preempted during the calls to
1262 int i; 1350 * ev_time and get_clock. a second call is almost guaranteed
1263 1351 * to succeed in that case, though. and looping a few more times
1264#if EV_USE_MONOTONIC 1352 * doesn't hurt either as we only do this on time-jumps or
1265 if (expect_true (have_monotonic)) 1353 * in the unlikely event of having been preempted here.
1266 { 1354 */
1267 if (time_update_monotonic (EV_A)) 1355 for (i = 4; --i; )
1268 { 1356 {
1269 ev_tstamp odiff = rtmn_diff;
1270
1271 /* loop a few times, before making important decisions.
1272 * on the choice of "4": one iteration isn't enough,
1273 * in case we get preempted during the calls to
1274 * ev_time and get_clock. a second call is almost guaranteed
1275 * to succeed in that case, though. and looping a few more times
1276 * doesn't hurt either as we only do this on time-jumps or
1277 * in the unlikely event of having been preempted here.
1278 */
1279 for (i = 4; --i; )
1280 {
1281 rtmn_diff = ev_rt_now - mn_now; 1357 rtmn_diff = ev_rt_now - mn_now;
1282 1358
1283 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1359 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1284 return; /* all is well */ 1360 return; /* all is well */
1285 1361
1286 ev_rt_now = ev_time (); 1362 ev_rt_now = ev_time ();
1287 mn_now = get_clock (); 1363 mn_now = get_clock ();
1288 now_floor = mn_now; 1364 now_floor = mn_now;
1289 } 1365 }
1290 1366
1291# if EV_PERIODIC_ENABLE 1367# if EV_PERIODIC_ENABLE
1292 periodics_reschedule (EV_A); 1368 periodics_reschedule (EV_A);
1293# endif 1369# endif
1294 /* no timer adjustment, as the monotonic clock doesn't jump */ 1370 /* no timer adjustment, as the monotonic clock doesn't jump */
1295 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1371 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1296 }
1297 } 1372 }
1298 else 1373 else
1299#endif 1374#endif
1300 { 1375 {
1301 ev_rt_now = ev_time (); 1376 ev_rt_now = ev_time ();
1302 1377
1303 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))
1304 { 1379 {
1305#if EV_PERIODIC_ENABLE 1380#if EV_PERIODIC_ENABLE
1306 periodics_reschedule (EV_A); 1381 periodics_reschedule (EV_A);
1307#endif 1382#endif
1308
1309 /* 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 */
1310 for (i = 0; i < timercnt; ++i) 1384 for (i = 0; i < timercnt; ++i)
1311 ((WT)timers [i])->at += ev_rt_now - mn_now; 1385 ((WT)timers [i])->at += ev_rt_now - mn_now;
1312 } 1386 }
1313 1387
… …
1334{ 1408{
1335 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1409 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1336 ? EVUNLOOP_ONE 1410 ? EVUNLOOP_ONE
1337 : EVUNLOOP_CANCEL; 1411 : EVUNLOOP_CANCEL;
1338 1412
1339 while (activecnt) 1413 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1414
1415 do
1340 { 1416 {
1417#ifndef _WIN32
1418 if (expect_false (curpid)) /* penalise the forking check even more */
1419 if (expect_false (getpid () != curpid))
1420 {
1421 curpid = getpid ();
1422 postfork = 1;
1423 }
1424#endif
1425
1341#if EV_FORK_ENABLE 1426#if EV_FORK_ENABLE
1342 /* we might have forked, so queue fork handlers */ 1427 /* we might have forked, so queue fork handlers */
1343 if (expect_false (postfork)) 1428 if (expect_false (postfork))
1344 if (forkcnt) 1429 if (forkcnt)
1345 { 1430 {
1346 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1431 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1347 call_pending (EV_A); 1432 call_pending (EV_A);
1348 } 1433 }
1349#endif 1434#endif
1350 1435
1351 /* queue check watchers (and execute them) */ 1436 /* queue prepare watchers (and execute them) */
1352 if (expect_false (preparecnt)) 1437 if (expect_false (preparecnt))
1353 { 1438 {
1354 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1439 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1355 call_pending (EV_A); 1440 call_pending (EV_A);
1356 } 1441 }
1357 1442
1443 if (expect_false (!activecnt))
1444 break;
1445
1358 /* we might have forked, so reify kernel state if necessary */ 1446 /* we might have forked, so reify kernel state if necessary */
1359 if (expect_false (postfork)) 1447 if (expect_false (postfork))
1360 loop_fork (EV_A); 1448 loop_fork (EV_A);
1361 1449
1362 /* update fd-related kernel structures */ 1450 /* update fd-related kernel structures */
… …
1364 1452
1365 /* calculate blocking time */ 1453 /* calculate blocking time */
1366 { 1454 {
1367 ev_tstamp block; 1455 ev_tstamp block;
1368 1456
1369 if (flags & EVLOOP_NONBLOCK || idlecnt) 1457 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1370 block = 0.; /* do not block at all */ 1458 block = 0.; /* do not block at all */
1371 else 1459 else
1372 { 1460 {
1373 /* update time to cancel out callback processing overhead */ 1461 /* update time to cancel out callback processing overhead */
1374#if EV_USE_MONOTONIC
1375 if (expect_true (have_monotonic))
1376 time_update_monotonic (EV_A); 1462 time_update (EV_A_ 1e100);
1377 else
1378#endif
1379 {
1380 ev_rt_now = ev_time ();
1381 mn_now = ev_rt_now;
1382 }
1383 1463
1384 block = MAX_BLOCKTIME; 1464 block = MAX_BLOCKTIME;
1385 1465
1386 if (timercnt) 1466 if (timercnt)
1387 { 1467 {
… …
1398#endif 1478#endif
1399 1479
1400 if (expect_false (block < 0.)) block = 0.; 1480 if (expect_false (block < 0.)) block = 0.;
1401 } 1481 }
1402 1482
1483 ++loop_count;
1403 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);
1404 } 1488 }
1405
1406 /* update ev_rt_now, do magic */
1407 time_update (EV_A);
1408 1489
1409 /* queue pending timers and reschedule them */ 1490 /* queue pending timers and reschedule them */
1410 timers_reify (EV_A); /* relative timers called last */ 1491 timers_reify (EV_A); /* relative timers called last */
1411#if EV_PERIODIC_ENABLE 1492#if EV_PERIODIC_ENABLE
1412 periodics_reify (EV_A); /* absolute timers called first */ 1493 periodics_reify (EV_A); /* absolute timers called first */
1413#endif 1494#endif
1414 1495
1496#if EV_IDLE_ENABLE
1415 /* queue idle watchers unless other events are pending */ 1497 /* queue idle watchers unless other events are pending */
1416 if (idlecnt && !any_pending (EV_A)) 1498 idle_reify (EV_A);
1417 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1499#endif
1418 1500
1419 /* queue check watchers, to be executed first */ 1501 /* queue check watchers, to be executed first */
1420 if (expect_false (checkcnt)) 1502 if (expect_false (checkcnt))
1421 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1503 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1422 1504
1423 call_pending (EV_A); 1505 call_pending (EV_A);
1424 1506
1425 if (expect_false (loop_done))
1426 break;
1427 } 1507 }
1508 while (expect_true (activecnt && !loop_done));
1428 1509
1429 if (loop_done == EVUNLOOP_ONE) 1510 if (loop_done == EVUNLOOP_ONE)
1430 loop_done = EVUNLOOP_CANCEL; 1511 loop_done = EVUNLOOP_CANCEL;
1431} 1512}
1432 1513
… …
1459 head = &(*head)->next; 1540 head = &(*head)->next;
1460 } 1541 }
1461} 1542}
1462 1543
1463void inline_speed 1544void inline_speed
1464ev_clear_pending (EV_P_ W w) 1545clear_pending (EV_P_ W w)
1465{ 1546{
1466 if (w->pending) 1547 if (w->pending)
1467 { 1548 {
1468 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1549 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1469 w->pending = 0; 1550 w->pending = 0;
1470 } 1551 }
1471} 1552}
1472 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
1473void inline_speed 1580void inline_speed
1474ev_start (EV_P_ W w, int active) 1581ev_start (EV_P_ W w, int active)
1475{ 1582{
1476 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1583 pri_adjust (EV_A_ w);
1477 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1478
1479 w->active = active; 1584 w->active = active;
1480 ev_ref (EV_A); 1585 ev_ref (EV_A);
1481} 1586}
1482 1587
1483void inline_size 1588void inline_size
… …
1487 w->active = 0; 1592 w->active = 0;
1488} 1593}
1489 1594
1490/*****************************************************************************/ 1595/*****************************************************************************/
1491 1596
1492void 1597void noinline
1493ev_io_start (EV_P_ ev_io *w) 1598ev_io_start (EV_P_ ev_io *w)
1494{ 1599{
1495 int fd = w->fd; 1600 int fd = w->fd;
1496 1601
1497 if (expect_false (ev_is_active (w))) 1602 if (expect_false (ev_is_active (w)))
… …
1499 1604
1500 assert (("ev_io_start called with negative fd", fd >= 0)); 1605 assert (("ev_io_start called with negative fd", fd >= 0));
1501 1606
1502 ev_start (EV_A_ (W)w, 1); 1607 ev_start (EV_A_ (W)w, 1);
1503 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1608 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1504 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1609 wlist_add (&anfds[fd].head, (WL)w);
1505 1610
1506 fd_change (EV_A_ fd); 1611 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1612 w->events &= ~EV_IOFDSET;
1507} 1613}
1508 1614
1509void 1615void noinline
1510ev_io_stop (EV_P_ ev_io *w) 1616ev_io_stop (EV_P_ ev_io *w)
1511{ 1617{
1512 ev_clear_pending (EV_A_ (W)w); 1618 clear_pending (EV_A_ (W)w);
1513 if (expect_false (!ev_is_active (w))) 1619 if (expect_false (!ev_is_active (w)))
1514 return; 1620 return;
1515 1621
1516 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));
1517 1623
1518 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1624 wlist_del (&anfds[w->fd].head, (WL)w);
1519 ev_stop (EV_A_ (W)w); 1625 ev_stop (EV_A_ (W)w);
1520 1626
1521 fd_change (EV_A_ w->fd); 1627 fd_change (EV_A_ w->fd, 1);
1522} 1628}
1523 1629
1524void 1630void noinline
1525ev_timer_start (EV_P_ ev_timer *w) 1631ev_timer_start (EV_P_ ev_timer *w)
1526{ 1632{
1527 if (expect_false (ev_is_active (w))) 1633 if (expect_false (ev_is_active (w)))
1528 return; 1634 return;
1529 1635
1530 ((WT)w)->at += mn_now; 1636 ((WT)w)->at += mn_now;
1531 1637
1532 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.));
1533 1639
1534 ev_start (EV_A_ (W)w, ++timercnt); 1640 ev_start (EV_A_ (W)w, ++timercnt);
1535 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1641 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1536 timers [timercnt - 1] = w; 1642 timers [timercnt - 1] = (WT)w;
1537 upheap ((WT *)timers, timercnt - 1); 1643 upheap (timers, timercnt - 1);
1538 1644
1539 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1645 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1540} 1646}
1541 1647
1542void 1648void noinline
1543ev_timer_stop (EV_P_ ev_timer *w) 1649ev_timer_stop (EV_P_ ev_timer *w)
1544{ 1650{
1545 ev_clear_pending (EV_A_ (W)w); 1651 clear_pending (EV_A_ (W)w);
1546 if (expect_false (!ev_is_active (w))) 1652 if (expect_false (!ev_is_active (w)))
1547 return; 1653 return;
1548 1654
1549 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1655 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1550 1656
1551 { 1657 {
1552 int active = ((W)w)->active; 1658 int active = ((W)w)->active;
1553 1659
1554 if (expect_true (--active < --timercnt)) 1660 if (expect_true (--active < --timercnt))
1555 { 1661 {
1556 timers [active] = timers [timercnt]; 1662 timers [active] = timers [timercnt];
1557 adjustheap ((WT *)timers, timercnt, active); 1663 adjustheap (timers, timercnt, active);
1558 } 1664 }
1559 } 1665 }
1560 1666
1561 ((WT)w)->at -= mn_now; 1667 ((WT)w)->at -= mn_now;
1562 1668
1563 ev_stop (EV_A_ (W)w); 1669 ev_stop (EV_A_ (W)w);
1564} 1670}
1565 1671
1566void 1672void noinline
1567ev_timer_again (EV_P_ ev_timer *w) 1673ev_timer_again (EV_P_ ev_timer *w)
1568{ 1674{
1569 if (ev_is_active (w)) 1675 if (ev_is_active (w))
1570 { 1676 {
1571 if (w->repeat) 1677 if (w->repeat)
1572 { 1678 {
1573 ((WT)w)->at = mn_now + w->repeat; 1679 ((WT)w)->at = mn_now + w->repeat;
1574 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1680 adjustheap (timers, timercnt, ((W)w)->active - 1);
1575 } 1681 }
1576 else 1682 else
1577 ev_timer_stop (EV_A_ w); 1683 ev_timer_stop (EV_A_ w);
1578 } 1684 }
1579 else if (w->repeat) 1685 else if (w->repeat)
… …
1582 ev_timer_start (EV_A_ w); 1688 ev_timer_start (EV_A_ w);
1583 } 1689 }
1584} 1690}
1585 1691
1586#if EV_PERIODIC_ENABLE 1692#if EV_PERIODIC_ENABLE
1587void 1693void noinline
1588ev_periodic_start (EV_P_ ev_periodic *w) 1694ev_periodic_start (EV_P_ ev_periodic *w)
1589{ 1695{
1590 if (expect_false (ev_is_active (w))) 1696 if (expect_false (ev_is_active (w)))
1591 return; 1697 return;
1592 1698
… …
1594 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1700 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1595 else if (w->interval) 1701 else if (w->interval)
1596 { 1702 {
1597 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.));
1598 /* 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 */
1599 ((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;
1600 } 1706 }
1707 else
1708 ((WT)w)->at = w->offset;
1601 1709
1602 ev_start (EV_A_ (W)w, ++periodiccnt); 1710 ev_start (EV_A_ (W)w, ++periodiccnt);
1603 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1711 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1604 periodics [periodiccnt - 1] = w; 1712 periodics [periodiccnt - 1] = (WT)w;
1605 upheap ((WT *)periodics, periodiccnt - 1); 1713 upheap (periodics, periodiccnt - 1);
1606 1714
1607 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1715 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1608} 1716}
1609 1717
1610void 1718void noinline
1611ev_periodic_stop (EV_P_ ev_periodic *w) 1719ev_periodic_stop (EV_P_ ev_periodic *w)
1612{ 1720{
1613 ev_clear_pending (EV_A_ (W)w); 1721 clear_pending (EV_A_ (W)w);
1614 if (expect_false (!ev_is_active (w))) 1722 if (expect_false (!ev_is_active (w)))
1615 return; 1723 return;
1616 1724
1617 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1725 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1618 1726
1619 { 1727 {
1620 int active = ((W)w)->active; 1728 int active = ((W)w)->active;
1621 1729
1622 if (expect_true (--active < --periodiccnt)) 1730 if (expect_true (--active < --periodiccnt))
1623 { 1731 {
1624 periodics [active] = periodics [periodiccnt]; 1732 periodics [active] = periodics [periodiccnt];
1625 adjustheap ((WT *)periodics, periodiccnt, active); 1733 adjustheap (periodics, periodiccnt, active);
1626 } 1734 }
1627 } 1735 }
1628 1736
1629 ev_stop (EV_A_ (W)w); 1737 ev_stop (EV_A_ (W)w);
1630} 1738}
1631 1739
1632void 1740void noinline
1633ev_periodic_again (EV_P_ ev_periodic *w) 1741ev_periodic_again (EV_P_ ev_periodic *w)
1634{ 1742{
1635 /* TODO: use adjustheap and recalculation */ 1743 /* TODO: use adjustheap and recalculation */
1636 ev_periodic_stop (EV_A_ w); 1744 ev_periodic_stop (EV_A_ w);
1637 ev_periodic_start (EV_A_ w); 1745 ev_periodic_start (EV_A_ w);
… …
1640 1748
1641#ifndef SA_RESTART 1749#ifndef SA_RESTART
1642# define SA_RESTART 0 1750# define SA_RESTART 0
1643#endif 1751#endif
1644 1752
1645void 1753void noinline
1646ev_signal_start (EV_P_ ev_signal *w) 1754ev_signal_start (EV_P_ ev_signal *w)
1647{ 1755{
1648#if EV_MULTIPLICITY 1756#if EV_MULTIPLICITY
1649 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));
1650#endif 1758#endif
1651 if (expect_false (ev_is_active (w))) 1759 if (expect_false (ev_is_active (w)))
1652 return; 1760 return;
1653 1761
1654 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));
1655 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
1656 ev_start (EV_A_ (W)w, 1); 1778 ev_start (EV_A_ (W)w, 1);
1657 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1658 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1779 wlist_add (&signals [w->signum - 1].head, (WL)w);
1659 1780
1660 if (!((WL)w)->next) 1781 if (!((WL)w)->next)
1661 { 1782 {
1662#if _WIN32 1783#if _WIN32
1663 signal (w->signum, sighandler); 1784 signal (w->signum, sighandler);
… …
1669 sigaction (w->signum, &sa, 0); 1790 sigaction (w->signum, &sa, 0);
1670#endif 1791#endif
1671 } 1792 }
1672} 1793}
1673 1794
1674void 1795void noinline
1675ev_signal_stop (EV_P_ ev_signal *w) 1796ev_signal_stop (EV_P_ ev_signal *w)
1676{ 1797{
1677 ev_clear_pending (EV_A_ (W)w); 1798 clear_pending (EV_A_ (W)w);
1678 if (expect_false (!ev_is_active (w))) 1799 if (expect_false (!ev_is_active (w)))
1679 return; 1800 return;
1680 1801
1681 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1802 wlist_del (&signals [w->signum - 1].head, (WL)w);
1682 ev_stop (EV_A_ (W)w); 1803 ev_stop (EV_A_ (W)w);
1683 1804
1684 if (!signals [w->signum - 1].head) 1805 if (!signals [w->signum - 1].head)
1685 signal (w->signum, SIG_DFL); 1806 signal (w->signum, SIG_DFL);
1686} 1807}
… …
1693#endif 1814#endif
1694 if (expect_false (ev_is_active (w))) 1815 if (expect_false (ev_is_active (w)))
1695 return; 1816 return;
1696 1817
1697 ev_start (EV_A_ (W)w, 1); 1818 ev_start (EV_A_ (W)w, 1);
1698 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1819 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1699} 1820}
1700 1821
1701void 1822void
1702ev_child_stop (EV_P_ ev_child *w) 1823ev_child_stop (EV_P_ ev_child *w)
1703{ 1824{
1704 ev_clear_pending (EV_A_ (W)w); 1825 clear_pending (EV_A_ (W)w);
1705 if (expect_false (!ev_is_active (w))) 1826 if (expect_false (!ev_is_active (w)))
1706 return; 1827 return;
1707 1828
1708 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1829 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1709 ev_stop (EV_A_ (W)w); 1830 ev_stop (EV_A_ (W)w);
1710} 1831}
1711 1832
1712#if EV_STAT_ENABLE 1833#if EV_STAT_ENABLE
1713 1834
… …
1945} 2066}
1946 2067
1947void 2068void
1948ev_stat_stop (EV_P_ ev_stat *w) 2069ev_stat_stop (EV_P_ ev_stat *w)
1949{ 2070{
1950 ev_clear_pending (EV_A_ (W)w); 2071 clear_pending (EV_A_ (W)w);
1951 if (expect_false (!ev_is_active (w))) 2072 if (expect_false (!ev_is_active (w)))
1952 return; 2073 return;
1953 2074
1954#if EV_USE_INOTIFY 2075#if EV_USE_INOTIFY
1955 infy_del (EV_A_ w); 2076 infy_del (EV_A_ w);
… …
1958 2079
1959 ev_stop (EV_A_ (W)w); 2080 ev_stop (EV_A_ (W)w);
1960} 2081}
1961#endif 2082#endif
1962 2083
2084#if EV_IDLE_ENABLE
1963void 2085void
1964ev_idle_start (EV_P_ ev_idle *w) 2086ev_idle_start (EV_P_ ev_idle *w)
1965{ 2087{
1966 if (expect_false (ev_is_active (w))) 2088 if (expect_false (ev_is_active (w)))
1967 return; 2089 return;
1968 2090
2091 pri_adjust (EV_A_ (W)w);
2092
2093 {
2094 int active = ++idlecnt [ABSPRI (w)];
2095
2096 ++idleall;
1969 ev_start (EV_A_ (W)w, ++idlecnt); 2097 ev_start (EV_A_ (W)w, active);
2098
1970 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2099 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1971 idles [idlecnt - 1] = w; 2100 idles [ABSPRI (w)][active - 1] = w;
2101 }
1972} 2102}
1973 2103
1974void 2104void
1975ev_idle_stop (EV_P_ ev_idle *w) 2105ev_idle_stop (EV_P_ ev_idle *w)
1976{ 2106{
1977 ev_clear_pending (EV_A_ (W)w); 2107 clear_pending (EV_A_ (W)w);
1978 if (expect_false (!ev_is_active (w))) 2108 if (expect_false (!ev_is_active (w)))
1979 return; 2109 return;
1980 2110
1981 { 2111 {
1982 int active = ((W)w)->active; 2112 int active = ((W)w)->active;
1983 idles [active - 1] = idles [--idlecnt]; 2113
2114 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1984 ((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;
1985 } 2119 }
1986
1987 ev_stop (EV_A_ (W)w);
1988} 2120}
2121#endif
1989 2122
1990void 2123void
1991ev_prepare_start (EV_P_ ev_prepare *w) 2124ev_prepare_start (EV_P_ ev_prepare *w)
1992{ 2125{
1993 if (expect_false (ev_is_active (w))) 2126 if (expect_false (ev_is_active (w)))
… …
1999} 2132}
2000 2133
2001void 2134void
2002ev_prepare_stop (EV_P_ ev_prepare *w) 2135ev_prepare_stop (EV_P_ ev_prepare *w)
2003{ 2136{
2004 ev_clear_pending (EV_A_ (W)w); 2137 clear_pending (EV_A_ (W)w);
2005 if (expect_false (!ev_is_active (w))) 2138 if (expect_false (!ev_is_active (w)))
2006 return; 2139 return;
2007 2140
2008 { 2141 {
2009 int active = ((W)w)->active; 2142 int active = ((W)w)->active;
… …
2026} 2159}
2027 2160
2028void 2161void
2029ev_check_stop (EV_P_ ev_check *w) 2162ev_check_stop (EV_P_ ev_check *w)
2030{ 2163{
2031 ev_clear_pending (EV_A_ (W)w); 2164 clear_pending (EV_A_ (W)w);
2032 if (expect_false (!ev_is_active (w))) 2165 if (expect_false (!ev_is_active (w)))
2033 return; 2166 return;
2034 2167
2035 { 2168 {
2036 int active = ((W)w)->active; 2169 int active = ((W)w)->active;
… …
2078} 2211}
2079 2212
2080void 2213void
2081ev_embed_stop (EV_P_ ev_embed *w) 2214ev_embed_stop (EV_P_ ev_embed *w)
2082{ 2215{
2083 ev_clear_pending (EV_A_ (W)w); 2216 clear_pending (EV_A_ (W)w);
2084 if (expect_false (!ev_is_active (w))) 2217 if (expect_false (!ev_is_active (w)))
2085 return; 2218 return;
2086 2219
2087 ev_io_stop (EV_A_ &w->io); 2220 ev_io_stop (EV_A_ &w->io);
2088 2221
… …
2103} 2236}
2104 2237
2105void 2238void
2106ev_fork_stop (EV_P_ ev_fork *w) 2239ev_fork_stop (EV_P_ ev_fork *w)
2107{ 2240{
2108 ev_clear_pending (EV_A_ (W)w); 2241 clear_pending (EV_A_ (W)w);
2109 if (expect_false (!ev_is_active (w))) 2242 if (expect_false (!ev_is_active (w)))
2110 return; 2243 return;
2111 2244
2112 { 2245 {
2113 int active = ((W)w)->active; 2246 int active = ((W)w)->active;

Diff Legend

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