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

Diff Legend

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