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

Diff Legend

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