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

Comparing libev/ev.c (file contents):
Revision 1.161 by root, Sat Dec 1 23:43:45 2007 UTC vs.
Revision 1.194 by root, Sat Dec 22 07:03:31 2007 UTC

51# ifndef EV_USE_MONOTONIC 51# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 52# define EV_USE_MONOTONIC 0
53# endif 53# endif
54# ifndef EV_USE_REALTIME 54# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 55# define EV_USE_REALTIME 0
56# endif
57# endif
58
59# ifndef EV_USE_NANOSLEEP
60# if HAVE_NANOSLEEP
61# define EV_USE_NANOSLEEP 1
62# else
63# define EV_USE_NANOSLEEP 0
56# endif 64# endif
57# endif 65# endif
58 66
59# ifndef EV_USE_SELECT 67# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 68# if HAVE_SELECT && HAVE_SYS_SELECT_H
146 154
147#ifndef EV_USE_REALTIME 155#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0 156# define EV_USE_REALTIME 0
149#endif 157#endif
150 158
159#ifndef EV_USE_NANOSLEEP
160# define EV_USE_NANOSLEEP 0
161#endif
162
151#ifndef EV_USE_SELECT 163#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 164# define EV_USE_SELECT 1
153#endif 165#endif
154 166
155#ifndef EV_USE_POLL 167#ifndef EV_USE_POLL
202#ifndef CLOCK_REALTIME 214#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 215# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 216# define EV_USE_REALTIME 0
205#endif 217#endif
206 218
219#if !EV_STAT_ENABLE
220# undef EV_USE_INOTIFY
221# define EV_USE_INOTIFY 0
222#endif
223
224#if !EV_USE_NANOSLEEP
225# ifndef _WIN32
226# include <sys/select.h>
227# endif
228#endif
229
230#if EV_USE_INOTIFY
231# include <sys/inotify.h>
232#endif
233
207#if EV_SELECT_IS_WINSOCKET 234#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 235# include <winsock.h>
209#endif 236#endif
210 237
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/**/ 238/**/
239
240/*
241 * This is used to avoid floating point rounding problems.
242 * It is added to ev_rt_now when scheduling periodics
243 * to ensure progress, time-wise, even when rounding
244 * errors are against us.
245 * This value is good at least till the year 4000.
246 * Better solutions welcome.
247 */
248#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
220 249
221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 250#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) */ 251#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 */ 252/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
224 253
225#if __GNUC__ >= 3 254#if __GNUC__ >= 4
226# define expect(expr,value) __builtin_expect ((expr),(value)) 255# 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)) 256# 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 257#else
236# define expect(expr,value) (expr) 258# define expect(expr,value) (expr)
237# define inline_speed static
238# define inline_size static
239# define noinline 259# define noinline
260# if __STDC_VERSION__ < 199901L
261# define inline
262# endif
240#endif 263#endif
241 264
242#define expect_false(expr) expect ((expr) != 0, 0) 265#define expect_false(expr) expect ((expr) != 0, 0)
243#define expect_true(expr) expect ((expr) != 0, 1) 266#define expect_true(expr) expect ((expr) != 0, 1)
267#define inline_size static inline
268
269#if EV_MINIMAL
270# define inline_speed static noinline
271#else
272# define inline_speed static inline
273#endif
244 274
245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 275#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
246#define ABSPRI(w) ((w)->priority - EV_MINPRI) 276#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247 277
248#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 278#define EMPTY /* required for microsofts broken pseudo-c compiler */
249#define EMPTY2(a,b) /* used to suppress some warnings */ 279#define EMPTY2(a,b) /* used to suppress some warnings */
250 280
251typedef ev_watcher *W; 281typedef ev_watcher *W;
252typedef ev_watcher_list *WL; 282typedef ev_watcher_list *WL;
253typedef ev_watcher_time *WT; 283typedef ev_watcher_time *WT;
254 284
285/* sig_atomic_t is used to avoid per-thread variables or locking but still */
286/* giving it a reasonably high chance of working on typical architetcures */
255static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 287static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
256 288
257#ifdef _WIN32 289#ifdef _WIN32
258# include "ev_win32.c" 290# include "ev_win32.c"
259#endif 291#endif
260 292
396{ 428{
397 return ev_rt_now; 429 return ev_rt_now;
398} 430}
399#endif 431#endif
400 432
401#define array_roundsize(type,n) (((n) | 4) & ~3) 433void
434ev_sleep (ev_tstamp delay)
435{
436 if (delay > 0.)
437 {
438#if EV_USE_NANOSLEEP
439 struct timespec ts;
440
441 ts.tv_sec = (time_t)delay;
442 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
443
444 nanosleep (&ts, 0);
445#elif defined(_WIN32)
446 Sleep (delay * 1e3);
447#else
448 struct timeval tv;
449
450 tv.tv_sec = (time_t)delay;
451 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
452
453 select (0, 0, 0, 0, &tv);
454#endif
455 }
456}
457
458/*****************************************************************************/
459
460int inline_size
461array_nextsize (int elem, int cur, int cnt)
462{
463 int ncur = cur + 1;
464
465 do
466 ncur <<= 1;
467 while (cnt > ncur);
468
469 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
470 if (elem * ncur > 4096)
471 {
472 ncur *= elem;
473 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
474 ncur = ncur - sizeof (void *) * 4;
475 ncur /= elem;
476 }
477
478 return ncur;
479}
480
481static noinline void *
482array_realloc (int elem, void *base, int *cur, int cnt)
483{
484 *cur = array_nextsize (elem, *cur, cnt);
485 return ev_realloc (base, elem * *cur);
486}
402 487
403#define array_needsize(type,base,cur,cnt,init) \ 488#define array_needsize(type,base,cur,cnt,init) \
404 if (expect_false ((cnt) > cur)) \ 489 if (expect_false ((cnt) > (cur))) \
405 { \ 490 { \
406 int newcnt = cur; \ 491 int ocur_ = (cur); \
407 do \ 492 (base) = (type *)array_realloc \
408 { \ 493 (sizeof (type), (base), &(cur), (cnt)); \
409 newcnt = array_roundsize (type, newcnt << 1); \ 494 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 } 495 }
417 496
497#if 0
418#define array_slim(type,stem) \ 498#define array_slim(type,stem) \
419 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 499 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
420 { \ 500 { \
421 stem ## max = array_roundsize (stem ## cnt >> 1); \ 501 stem ## max = array_roundsize (stem ## cnt >> 1); \
422 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 502 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
423 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 503 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
424 } 504 }
505#endif
425 506
426#define array_free(stem, idx) \ 507#define array_free(stem, idx) \
427 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 508 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
428 509
429/*****************************************************************************/ 510/*****************************************************************************/
430 511
431void noinline 512void noinline
432ev_feed_event (EV_P_ void *w, int revents) 513ev_feed_event (EV_P_ void *w, int revents)
433{ 514{
434 W w_ = (W)w; 515 W w_ = (W)w;
516 int pri = ABSPRI (w_);
435 517
436 if (expect_false (w_->pending)) 518 if (expect_false (w_->pending))
519 pendings [pri][w_->pending - 1].events |= revents;
520 else
437 { 521 {
522 w_->pending = ++pendingcnt [pri];
523 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
524 pendings [pri][w_->pending - 1].w = w_;
438 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 525 pendings [pri][w_->pending - 1].events = revents;
439 return;
440 } 526 }
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} 527}
447 528
448void inline_size 529void inline_speed
449queue_events (EV_P_ W *events, int eventcnt, int type) 530queue_events (EV_P_ W *events, int eventcnt, int type)
450{ 531{
451 int i; 532 int i;
452 533
453 for (i = 0; i < eventcnt; ++i) 534 for (i = 0; i < eventcnt; ++i)
485} 566}
486 567
487void 568void
488ev_feed_fd_event (EV_P_ int fd, int revents) 569ev_feed_fd_event (EV_P_ int fd, int revents)
489{ 570{
571 if (fd >= 0 && fd < anfdmax)
490 fd_event (EV_A_ fd, revents); 572 fd_event (EV_A_ fd, revents);
491} 573}
492 574
493void inline_size 575void inline_size
494fd_reify (EV_P) 576fd_reify (EV_P)
495{ 577{
499 { 581 {
500 int fd = fdchanges [i]; 582 int fd = fdchanges [i];
501 ANFD *anfd = anfds + fd; 583 ANFD *anfd = anfds + fd;
502 ev_io *w; 584 ev_io *w;
503 585
504 int events = 0; 586 unsigned char events = 0;
505 587
506 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 588 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
507 events |= w->events; 589 events |= (unsigned char)w->events;
508 590
509#if EV_SELECT_IS_WINSOCKET 591#if EV_SELECT_IS_WINSOCKET
510 if (events) 592 if (events)
511 { 593 {
512 unsigned long argp; 594 unsigned long argp;
513 anfd->handle = _get_osfhandle (fd); 595 anfd->handle = _get_osfhandle (fd);
514 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 596 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
515 } 597 }
516#endif 598#endif
517 599
600 {
601 unsigned char o_events = anfd->events;
602 unsigned char o_reify = anfd->reify;
603
518 anfd->reify = 0; 604 anfd->reify = 0;
519
520 backend_modify (EV_A_ fd, anfd->events, events);
521 anfd->events = events; 605 anfd->events = events;
606
607 if (o_events != events || o_reify & EV_IOFDSET)
608 backend_modify (EV_A_ fd, o_events, events);
609 }
522 } 610 }
523 611
524 fdchangecnt = 0; 612 fdchangecnt = 0;
525} 613}
526 614
527void inline_size 615void inline_size
528fd_change (EV_P_ int fd) 616fd_change (EV_P_ int fd, int flags)
529{ 617{
530 if (expect_false (anfds [fd].reify)) 618 unsigned char reify = anfds [fd].reify;
531 return;
532
533 anfds [fd].reify = 1; 619 anfds [fd].reify |= flags;
534 620
621 if (expect_true (!reify))
622 {
535 ++fdchangecnt; 623 ++fdchangecnt;
536 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 624 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
537 fdchanges [fdchangecnt - 1] = fd; 625 fdchanges [fdchangecnt - 1] = fd;
626 }
538} 627}
539 628
540void inline_speed 629void inline_speed
541fd_kill (EV_P_ int fd) 630fd_kill (EV_P_ int fd)
542{ 631{
593 682
594 for (fd = 0; fd < anfdmax; ++fd) 683 for (fd = 0; fd < anfdmax; ++fd)
595 if (anfds [fd].events) 684 if (anfds [fd].events)
596 { 685 {
597 anfds [fd].events = 0; 686 anfds [fd].events = 0;
598 fd_change (EV_A_ fd); 687 fd_change (EV_A_ fd, EV_IOFDSET | 1);
599 } 688 }
600} 689}
601 690
602/*****************************************************************************/ 691/*****************************************************************************/
603 692
604void inline_speed 693void inline_speed
605upheap (WT *heap, int k) 694upheap (WT *heap, int k)
606{ 695{
607 WT w = heap [k]; 696 WT w = heap [k];
608 697
609 while (k && heap [k >> 1]->at > w->at) 698 while (k)
610 { 699 {
700 int p = (k - 1) >> 1;
701
702 if (heap [p]->at <= w->at)
703 break;
704
611 heap [k] = heap [k >> 1]; 705 heap [k] = heap [p];
612 ((W)heap [k])->active = k + 1; 706 ((W)heap [k])->active = k + 1;
613 k >>= 1; 707 k = p;
614 } 708 }
615 709
616 heap [k] = w; 710 heap [k] = w;
617 ((W)heap [k])->active = k + 1; 711 ((W)heap [k])->active = k + 1;
618
619} 712}
620 713
621void inline_speed 714void inline_speed
622downheap (WT *heap, int N, int k) 715downheap (WT *heap, int N, int k)
623{ 716{
624 WT w = heap [k]; 717 WT w = heap [k];
625 718
626 while (k < (N >> 1)) 719 for (;;)
627 { 720 {
628 int j = k << 1; 721 int c = (k << 1) + 1;
629 722
630 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 723 if (c >= N)
631 ++j;
632
633 if (w->at <= heap [j]->at)
634 break; 724 break;
635 725
726 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
727 ? 1 : 0;
728
729 if (w->at <= heap [c]->at)
730 break;
731
636 heap [k] = heap [j]; 732 heap [k] = heap [c];
637 ((W)heap [k])->active = k + 1; 733 ((W)heap [k])->active = k + 1;
734
638 k = j; 735 k = c;
639 } 736 }
640 737
641 heap [k] = w; 738 heap [k] = w;
642 ((W)heap [k])->active = k + 1; 739 ((W)heap [k])->active = k + 1;
643} 740}
725 for (signum = signalmax; signum--; ) 822 for (signum = signalmax; signum--; )
726 if (signals [signum].gotsig) 823 if (signals [signum].gotsig)
727 ev_feed_signal_event (EV_A_ signum + 1); 824 ev_feed_signal_event (EV_A_ signum + 1);
728} 825}
729 826
730void inline_size 827void inline_speed
731fd_intern (int fd) 828fd_intern (int fd)
732{ 829{
733#ifdef _WIN32 830#ifdef _WIN32
734 int arg = 1; 831 int arg = 1;
735 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 832 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
750 ev_unref (EV_A); /* child watcher should not keep loop alive */ 847 ev_unref (EV_A); /* child watcher should not keep loop alive */
751} 848}
752 849
753/*****************************************************************************/ 850/*****************************************************************************/
754 851
755static ev_child *childs [EV_PID_HASHSIZE]; 852static WL childs [EV_PID_HASHSIZE];
756 853
757#ifndef _WIN32 854#ifndef _WIN32
758 855
759static ev_signal childev; 856static ev_signal childev;
760 857
764 ev_child *w; 861 ev_child *w;
765 862
766 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 863 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
767 if (w->pid == pid || !w->pid) 864 if (w->pid == pid || !w->pid)
768 { 865 {
769 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 866 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
770 w->rpid = pid; 867 w->rpid = pid;
771 w->rstatus = status; 868 w->rstatus = status;
772 ev_feed_event (EV_A_ (W)w, EV_CHILD); 869 ev_feed_event (EV_A_ (W)w, EV_CHILD);
773 } 870 }
774} 871}
775 872
776#ifndef WCONTINUED 873#ifndef WCONTINUED
875} 972}
876 973
877unsigned int 974unsigned int
878ev_embeddable_backends (void) 975ev_embeddable_backends (void)
879{ 976{
977 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
880 return EVBACKEND_EPOLL 978 return EVBACKEND_KQUEUE
881 | EVBACKEND_KQUEUE
882 | EVBACKEND_PORT; 979 | EVBACKEND_PORT;
883} 980}
884 981
885unsigned int 982unsigned int
886ev_backend (EV_P) 983ev_backend (EV_P)
887{ 984{
888 return backend; 985 return backend;
986}
987
988unsigned int
989ev_loop_count (EV_P)
990{
991 return loop_count;
992}
993
994void
995ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
996{
997 io_blocktime = interval;
998}
999
1000void
1001ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1002{
1003 timeout_blocktime = interval;
889} 1004}
890 1005
891static void noinline 1006static void noinline
892loop_init (EV_P_ unsigned int flags) 1007loop_init (EV_P_ unsigned int flags)
893{ 1008{
904 ev_rt_now = ev_time (); 1019 ev_rt_now = ev_time ();
905 mn_now = get_clock (); 1020 mn_now = get_clock ();
906 now_floor = mn_now; 1021 now_floor = mn_now;
907 rtmn_diff = ev_rt_now - mn_now; 1022 rtmn_diff = ev_rt_now - mn_now;
908 1023
1024 io_blocktime = 0.;
1025 timeout_blocktime = 0.;
1026
909 /* pid check not overridable via env */ 1027 /* pid check not overridable via env */
910#ifndef _WIN32 1028#ifndef _WIN32
911 if (flags & EVFLAG_FORKCHECK) 1029 if (flags & EVFLAG_FORKCHECK)
912 curpid = getpid (); 1030 curpid = getpid ();
913#endif 1031#endif
975#if EV_USE_SELECT 1093#if EV_USE_SELECT
976 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1094 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
977#endif 1095#endif
978 1096
979 for (i = NUMPRI; i--; ) 1097 for (i = NUMPRI; i--; )
1098 {
980 array_free (pending, [i]); 1099 array_free (pending, [i]);
1100#if EV_IDLE_ENABLE
1101 array_free (idle, [i]);
1102#endif
1103 }
1104
1105 ev_free (anfds); anfdmax = 0;
981 1106
982 /* have to use the microsoft-never-gets-it-right macro */ 1107 /* have to use the microsoft-never-gets-it-right macro */
983 array_free (fdchange, EMPTY0); 1108 array_free (fdchange, EMPTY);
984 array_free (timer, EMPTY0); 1109 array_free (timer, EMPTY);
985#if EV_PERIODIC_ENABLE 1110#if EV_PERIODIC_ENABLE
986 array_free (periodic, EMPTY0); 1111 array_free (periodic, EMPTY);
987#endif 1112#endif
1113#if EV_FORK_ENABLE
988 array_free (idle, EMPTY0); 1114 array_free (fork, EMPTY);
1115#endif
989 array_free (prepare, EMPTY0); 1116 array_free (prepare, EMPTY);
990 array_free (check, EMPTY0); 1117 array_free (check, EMPTY);
991 1118
992 backend = 0; 1119 backend = 0;
993} 1120}
994 1121
995void inline_size infy_fork (EV_P); 1122void inline_size infy_fork (EV_P);
1131 postfork = 1; 1258 postfork = 1;
1132} 1259}
1133 1260
1134/*****************************************************************************/ 1261/*****************************************************************************/
1135 1262
1136int inline_size 1263void
1137any_pending (EV_P) 1264ev_invoke (EV_P_ void *w, int revents)
1138{ 1265{
1139 int pri; 1266 EV_CB_INVOKE ((W)w, revents);
1140
1141 for (pri = NUMPRI; pri--; )
1142 if (pendingcnt [pri])
1143 return 1;
1144
1145 return 0;
1146} 1267}
1147 1268
1148void inline_speed 1269void inline_speed
1149call_pending (EV_P) 1270call_pending (EV_P)
1150{ 1271{
1168void inline_size 1289void inline_size
1169timers_reify (EV_P) 1290timers_reify (EV_P)
1170{ 1291{
1171 while (timercnt && ((WT)timers [0])->at <= mn_now) 1292 while (timercnt && ((WT)timers [0])->at <= mn_now)
1172 { 1293 {
1173 ev_timer *w = timers [0]; 1294 ev_timer *w = (ev_timer *)timers [0];
1174 1295
1175 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1296 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1176 1297
1177 /* first reschedule or stop timer */ 1298 /* first reschedule or stop timer */
1178 if (w->repeat) 1299 if (w->repeat)
1181 1302
1182 ((WT)w)->at += w->repeat; 1303 ((WT)w)->at += w->repeat;
1183 if (((WT)w)->at < mn_now) 1304 if (((WT)w)->at < mn_now)
1184 ((WT)w)->at = mn_now; 1305 ((WT)w)->at = mn_now;
1185 1306
1186 downheap ((WT *)timers, timercnt, 0); 1307 downheap (timers, timercnt, 0);
1187 } 1308 }
1188 else 1309 else
1189 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1310 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1190 1311
1191 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1312 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1196void inline_size 1317void inline_size
1197periodics_reify (EV_P) 1318periodics_reify (EV_P)
1198{ 1319{
1199 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1320 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1200 { 1321 {
1201 ev_periodic *w = periodics [0]; 1322 ev_periodic *w = (ev_periodic *)periodics [0];
1202 1323
1203 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1324 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1204 1325
1205 /* first reschedule or stop timer */ 1326 /* first reschedule or stop timer */
1206 if (w->reschedule_cb) 1327 if (w->reschedule_cb)
1207 { 1328 {
1208 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1329 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1209 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1330 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1210 downheap ((WT *)periodics, periodiccnt, 0); 1331 downheap (periodics, periodiccnt, 0);
1211 } 1332 }
1212 else if (w->interval) 1333 else if (w->interval)
1213 { 1334 {
1214 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1335 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1336 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1215 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1337 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1216 downheap ((WT *)periodics, periodiccnt, 0); 1338 downheap (periodics, periodiccnt, 0);
1217 } 1339 }
1218 else 1340 else
1219 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1341 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1220 1342
1221 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1343 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1228 int i; 1350 int i;
1229 1351
1230 /* adjust periodics after time jump */ 1352 /* adjust periodics after time jump */
1231 for (i = 0; i < periodiccnt; ++i) 1353 for (i = 0; i < periodiccnt; ++i)
1232 { 1354 {
1233 ev_periodic *w = periodics [i]; 1355 ev_periodic *w = (ev_periodic *)periodics [i];
1234 1356
1235 if (w->reschedule_cb) 1357 if (w->reschedule_cb)
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1358 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1237 else if (w->interval) 1359 else if (w->interval)
1238 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1360 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1239 } 1361 }
1240 1362
1241 /* now rebuild the heap */ 1363 /* now rebuild the heap */
1242 for (i = periodiccnt >> 1; i--; ) 1364 for (i = periodiccnt >> 1; i--; )
1243 downheap ((WT *)periodics, periodiccnt, i); 1365 downheap (periodics, periodiccnt, i);
1244} 1366}
1245#endif 1367#endif
1246 1368
1369#if EV_IDLE_ENABLE
1247int inline_size 1370void inline_size
1248time_update_monotonic (EV_P) 1371idle_reify (EV_P)
1249{ 1372{
1373 if (expect_false (idleall))
1374 {
1375 int pri;
1376
1377 for (pri = NUMPRI; pri--; )
1378 {
1379 if (pendingcnt [pri])
1380 break;
1381
1382 if (idlecnt [pri])
1383 {
1384 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1385 break;
1386 }
1387 }
1388 }
1389}
1390#endif
1391
1392void inline_speed
1393time_update (EV_P_ ev_tstamp max_block)
1394{
1395 int i;
1396
1397#if EV_USE_MONOTONIC
1398 if (expect_true (have_monotonic))
1399 {
1400 ev_tstamp odiff = rtmn_diff;
1401
1250 mn_now = get_clock (); 1402 mn_now = get_clock ();
1251 1403
1404 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1405 /* interpolate in the meantime */
1252 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1406 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1253 { 1407 {
1254 ev_rt_now = rtmn_diff + mn_now; 1408 ev_rt_now = rtmn_diff + mn_now;
1255 return 0; 1409 return;
1256 } 1410 }
1257 else 1411
1258 {
1259 now_floor = mn_now; 1412 now_floor = mn_now;
1260 ev_rt_now = ev_time (); 1413 ev_rt_now = ev_time ();
1261 return 1;
1262 }
1263}
1264 1414
1265void inline_size 1415 /* loop a few times, before making important decisions.
1266time_update (EV_P) 1416 * on the choice of "4": one iteration isn't enough,
1267{ 1417 * in case we get preempted during the calls to
1268 int i; 1418 * ev_time and get_clock. a second call is almost guaranteed
1269 1419 * to succeed in that case, though. and looping a few more times
1270#if EV_USE_MONOTONIC 1420 * doesn't hurt either as we only do this on time-jumps or
1271 if (expect_true (have_monotonic)) 1421 * in the unlikely event of having been preempted here.
1272 { 1422 */
1273 if (time_update_monotonic (EV_A)) 1423 for (i = 4; --i; )
1274 { 1424 {
1275 ev_tstamp odiff = rtmn_diff;
1276
1277 /* loop a few times, before making important decisions.
1278 * on the choice of "4": one iteration isn't enough,
1279 * in case we get preempted during the calls to
1280 * ev_time and get_clock. a second call is almost guaranteed
1281 * to succeed in that case, though. and looping a few more times
1282 * doesn't hurt either as we only do this on time-jumps or
1283 * in the unlikely event of having been preempted here.
1284 */
1285 for (i = 4; --i; )
1286 {
1287 rtmn_diff = ev_rt_now - mn_now; 1425 rtmn_diff = ev_rt_now - mn_now;
1288 1426
1289 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1427 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1290 return; /* all is well */ 1428 return; /* all is well */
1291 1429
1292 ev_rt_now = ev_time (); 1430 ev_rt_now = ev_time ();
1293 mn_now = get_clock (); 1431 mn_now = get_clock ();
1294 now_floor = mn_now; 1432 now_floor = mn_now;
1295 } 1433 }
1296 1434
1297# if EV_PERIODIC_ENABLE 1435# if EV_PERIODIC_ENABLE
1298 periodics_reschedule (EV_A); 1436 periodics_reschedule (EV_A);
1299# endif 1437# endif
1300 /* no timer adjustment, as the monotonic clock doesn't jump */ 1438 /* no timer adjustment, as the monotonic clock doesn't jump */
1301 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1439 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1302 }
1303 } 1440 }
1304 else 1441 else
1305#endif 1442#endif
1306 { 1443 {
1307 ev_rt_now = ev_time (); 1444 ev_rt_now = ev_time ();
1308 1445
1309 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1446 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1310 { 1447 {
1311#if EV_PERIODIC_ENABLE 1448#if EV_PERIODIC_ENABLE
1312 periodics_reschedule (EV_A); 1449 periodics_reschedule (EV_A);
1313#endif 1450#endif
1314
1315 /* adjust timers. this is easy, as the offset is the same for all of them */ 1451 /* adjust timers. this is easy, as the offset is the same for all of them */
1316 for (i = 0; i < timercnt; ++i) 1452 for (i = 0; i < timercnt; ++i)
1317 ((WT)timers [i])->at += ev_rt_now - mn_now; 1453 ((WT)timers [i])->at += ev_rt_now - mn_now;
1318 } 1454 }
1319 1455
1363 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1499 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1364 call_pending (EV_A); 1500 call_pending (EV_A);
1365 } 1501 }
1366#endif 1502#endif
1367 1503
1368 /* queue check watchers (and execute them) */ 1504 /* queue prepare watchers (and execute them) */
1369 if (expect_false (preparecnt)) 1505 if (expect_false (preparecnt))
1370 { 1506 {
1371 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1507 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1372 call_pending (EV_A); 1508 call_pending (EV_A);
1373 } 1509 }
1382 /* update fd-related kernel structures */ 1518 /* update fd-related kernel structures */
1383 fd_reify (EV_A); 1519 fd_reify (EV_A);
1384 1520
1385 /* calculate blocking time */ 1521 /* calculate blocking time */
1386 { 1522 {
1387 ev_tstamp block; 1523 ev_tstamp waittime = 0.;
1524 ev_tstamp sleeptime = 0.;
1388 1525
1389 if (expect_false (flags & EVLOOP_NONBLOCK || idlecnt || !activecnt)) 1526 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1390 block = 0.; /* do not block at all */
1391 else
1392 { 1527 {
1393 /* update time to cancel out callback processing overhead */ 1528 /* update time to cancel out callback processing overhead */
1394#if EV_USE_MONOTONIC
1395 if (expect_true (have_monotonic))
1396 time_update_monotonic (EV_A); 1529 time_update (EV_A_ 1e100);
1397 else
1398#endif
1399 {
1400 ev_rt_now = ev_time ();
1401 mn_now = ev_rt_now;
1402 }
1403 1530
1404 block = MAX_BLOCKTIME; 1531 waittime = MAX_BLOCKTIME;
1405 1532
1406 if (timercnt) 1533 if (timercnt)
1407 { 1534 {
1408 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1535 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1409 if (block > to) block = to; 1536 if (waittime > to) waittime = to;
1410 } 1537 }
1411 1538
1412#if EV_PERIODIC_ENABLE 1539#if EV_PERIODIC_ENABLE
1413 if (periodiccnt) 1540 if (periodiccnt)
1414 { 1541 {
1415 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1542 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1416 if (block > to) block = to; 1543 if (waittime > to) waittime = to;
1417 } 1544 }
1418#endif 1545#endif
1419 1546
1420 if (expect_false (block < 0.)) block = 0.; 1547 if (expect_false (waittime < timeout_blocktime))
1548 waittime = timeout_blocktime;
1549
1550 sleeptime = waittime - backend_fudge;
1551
1552 if (expect_true (sleeptime > io_blocktime))
1553 sleeptime = io_blocktime;
1554
1555 if (sleeptime)
1556 {
1557 ev_sleep (sleeptime);
1558 waittime -= sleeptime;
1559 }
1421 } 1560 }
1422 1561
1562 ++loop_count;
1423 backend_poll (EV_A_ block); 1563 backend_poll (EV_A_ waittime);
1564
1565 /* update ev_rt_now, do magic */
1566 time_update (EV_A_ waittime + sleeptime);
1424 } 1567 }
1425
1426 /* update ev_rt_now, do magic */
1427 time_update (EV_A);
1428 1568
1429 /* queue pending timers and reschedule them */ 1569 /* queue pending timers and reschedule them */
1430 timers_reify (EV_A); /* relative timers called last */ 1570 timers_reify (EV_A); /* relative timers called last */
1431#if EV_PERIODIC_ENABLE 1571#if EV_PERIODIC_ENABLE
1432 periodics_reify (EV_A); /* absolute timers called first */ 1572 periodics_reify (EV_A); /* absolute timers called first */
1433#endif 1573#endif
1434 1574
1575#if EV_IDLE_ENABLE
1435 /* queue idle watchers unless other events are pending */ 1576 /* queue idle watchers unless other events are pending */
1436 if (idlecnt && !any_pending (EV_A)) 1577 idle_reify (EV_A);
1437 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1578#endif
1438 1579
1439 /* queue check watchers, to be executed first */ 1580 /* queue check watchers, to be executed first */
1440 if (expect_false (checkcnt)) 1581 if (expect_false (checkcnt))
1441 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1582 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1442 1583
1478 head = &(*head)->next; 1619 head = &(*head)->next;
1479 } 1620 }
1480} 1621}
1481 1622
1482void inline_speed 1623void inline_speed
1483ev_clear_pending (EV_P_ W w) 1624clear_pending (EV_P_ W w)
1484{ 1625{
1485 if (w->pending) 1626 if (w->pending)
1486 { 1627 {
1487 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1628 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1488 w->pending = 0; 1629 w->pending = 0;
1489 } 1630 }
1490} 1631}
1491 1632
1633int
1634ev_clear_pending (EV_P_ void *w)
1635{
1636 W w_ = (W)w;
1637 int pending = w_->pending;
1638
1639 if (expect_true (pending))
1640 {
1641 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1642 w_->pending = 0;
1643 p->w = 0;
1644 return p->events;
1645 }
1646 else
1647 return 0;
1648}
1649
1650void inline_size
1651pri_adjust (EV_P_ W w)
1652{
1653 int pri = w->priority;
1654 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1655 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1656 w->priority = pri;
1657}
1658
1492void inline_speed 1659void inline_speed
1493ev_start (EV_P_ W w, int active) 1660ev_start (EV_P_ W w, int active)
1494{ 1661{
1495 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1662 pri_adjust (EV_A_ w);
1496 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1497
1498 w->active = active; 1663 w->active = active;
1499 ev_ref (EV_A); 1664 ev_ref (EV_A);
1500} 1665}
1501 1666
1502void inline_size 1667void inline_size
1506 w->active = 0; 1671 w->active = 0;
1507} 1672}
1508 1673
1509/*****************************************************************************/ 1674/*****************************************************************************/
1510 1675
1511void 1676void noinline
1512ev_io_start (EV_P_ ev_io *w) 1677ev_io_start (EV_P_ ev_io *w)
1513{ 1678{
1514 int fd = w->fd; 1679 int fd = w->fd;
1515 1680
1516 if (expect_false (ev_is_active (w))) 1681 if (expect_false (ev_is_active (w)))
1518 1683
1519 assert (("ev_io_start called with negative fd", fd >= 0)); 1684 assert (("ev_io_start called with negative fd", fd >= 0));
1520 1685
1521 ev_start (EV_A_ (W)w, 1); 1686 ev_start (EV_A_ (W)w, 1);
1522 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1687 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1523 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1688 wlist_add (&anfds[fd].head, (WL)w);
1524 1689
1525 fd_change (EV_A_ fd); 1690 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1691 w->events &= ~EV_IOFDSET;
1526} 1692}
1527 1693
1528void 1694void noinline
1529ev_io_stop (EV_P_ ev_io *w) 1695ev_io_stop (EV_P_ ev_io *w)
1530{ 1696{
1531 ev_clear_pending (EV_A_ (W)w); 1697 clear_pending (EV_A_ (W)w);
1532 if (expect_false (!ev_is_active (w))) 1698 if (expect_false (!ev_is_active (w)))
1533 return; 1699 return;
1534 1700
1535 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1701 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1536 1702
1537 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1703 wlist_del (&anfds[w->fd].head, (WL)w);
1538 ev_stop (EV_A_ (W)w); 1704 ev_stop (EV_A_ (W)w);
1539 1705
1540 fd_change (EV_A_ w->fd); 1706 fd_change (EV_A_ w->fd, 1);
1541} 1707}
1542 1708
1543void 1709void noinline
1544ev_timer_start (EV_P_ ev_timer *w) 1710ev_timer_start (EV_P_ ev_timer *w)
1545{ 1711{
1546 if (expect_false (ev_is_active (w))) 1712 if (expect_false (ev_is_active (w)))
1547 return; 1713 return;
1548 1714
1549 ((WT)w)->at += mn_now; 1715 ((WT)w)->at += mn_now;
1550 1716
1551 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1717 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1552 1718
1553 ev_start (EV_A_ (W)w, ++timercnt); 1719 ev_start (EV_A_ (W)w, ++timercnt);
1554 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1720 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1555 timers [timercnt - 1] = w; 1721 timers [timercnt - 1] = (WT)w;
1556 upheap ((WT *)timers, timercnt - 1); 1722 upheap (timers, timercnt - 1);
1557 1723
1558 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1724 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1559} 1725}
1560 1726
1561void 1727void noinline
1562ev_timer_stop (EV_P_ ev_timer *w) 1728ev_timer_stop (EV_P_ ev_timer *w)
1563{ 1729{
1564 ev_clear_pending (EV_A_ (W)w); 1730 clear_pending (EV_A_ (W)w);
1565 if (expect_false (!ev_is_active (w))) 1731 if (expect_false (!ev_is_active (w)))
1566 return; 1732 return;
1567 1733
1568 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1734 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1569 1735
1570 { 1736 {
1571 int active = ((W)w)->active; 1737 int active = ((W)w)->active;
1572 1738
1573 if (expect_true (--active < --timercnt)) 1739 if (expect_true (--active < --timercnt))
1574 { 1740 {
1575 timers [active] = timers [timercnt]; 1741 timers [active] = timers [timercnt];
1576 adjustheap ((WT *)timers, timercnt, active); 1742 adjustheap (timers, timercnt, active);
1577 } 1743 }
1578 } 1744 }
1579 1745
1580 ((WT)w)->at -= mn_now; 1746 ((WT)w)->at -= mn_now;
1581 1747
1582 ev_stop (EV_A_ (W)w); 1748 ev_stop (EV_A_ (W)w);
1583} 1749}
1584 1750
1585void 1751void noinline
1586ev_timer_again (EV_P_ ev_timer *w) 1752ev_timer_again (EV_P_ ev_timer *w)
1587{ 1753{
1588 if (ev_is_active (w)) 1754 if (ev_is_active (w))
1589 { 1755 {
1590 if (w->repeat) 1756 if (w->repeat)
1591 { 1757 {
1592 ((WT)w)->at = mn_now + w->repeat; 1758 ((WT)w)->at = mn_now + w->repeat;
1593 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1759 adjustheap (timers, timercnt, ((W)w)->active - 1);
1594 } 1760 }
1595 else 1761 else
1596 ev_timer_stop (EV_A_ w); 1762 ev_timer_stop (EV_A_ w);
1597 } 1763 }
1598 else if (w->repeat) 1764 else if (w->repeat)
1601 ev_timer_start (EV_A_ w); 1767 ev_timer_start (EV_A_ w);
1602 } 1768 }
1603} 1769}
1604 1770
1605#if EV_PERIODIC_ENABLE 1771#if EV_PERIODIC_ENABLE
1606void 1772void noinline
1607ev_periodic_start (EV_P_ ev_periodic *w) 1773ev_periodic_start (EV_P_ ev_periodic *w)
1608{ 1774{
1609 if (expect_false (ev_is_active (w))) 1775 if (expect_false (ev_is_active (w)))
1610 return; 1776 return;
1611 1777
1613 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1779 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1614 else if (w->interval) 1780 else if (w->interval)
1615 { 1781 {
1616 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1782 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1617 /* this formula differs from the one in periodic_reify because we do not always round up */ 1783 /* this formula differs from the one in periodic_reify because we do not always round up */
1618 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1784 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1619 } 1785 }
1786 else
1787 ((WT)w)->at = w->offset;
1620 1788
1621 ev_start (EV_A_ (W)w, ++periodiccnt); 1789 ev_start (EV_A_ (W)w, ++periodiccnt);
1622 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1790 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1623 periodics [periodiccnt - 1] = w; 1791 periodics [periodiccnt - 1] = (WT)w;
1624 upheap ((WT *)periodics, periodiccnt - 1); 1792 upheap (periodics, periodiccnt - 1);
1625 1793
1626 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1794 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1627} 1795}
1628 1796
1629void 1797void noinline
1630ev_periodic_stop (EV_P_ ev_periodic *w) 1798ev_periodic_stop (EV_P_ ev_periodic *w)
1631{ 1799{
1632 ev_clear_pending (EV_A_ (W)w); 1800 clear_pending (EV_A_ (W)w);
1633 if (expect_false (!ev_is_active (w))) 1801 if (expect_false (!ev_is_active (w)))
1634 return; 1802 return;
1635 1803
1636 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1804 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1637 1805
1638 { 1806 {
1639 int active = ((W)w)->active; 1807 int active = ((W)w)->active;
1640 1808
1641 if (expect_true (--active < --periodiccnt)) 1809 if (expect_true (--active < --periodiccnt))
1642 { 1810 {
1643 periodics [active] = periodics [periodiccnt]; 1811 periodics [active] = periodics [periodiccnt];
1644 adjustheap ((WT *)periodics, periodiccnt, active); 1812 adjustheap (periodics, periodiccnt, active);
1645 } 1813 }
1646 } 1814 }
1647 1815
1648 ev_stop (EV_A_ (W)w); 1816 ev_stop (EV_A_ (W)w);
1649} 1817}
1650 1818
1651void 1819void noinline
1652ev_periodic_again (EV_P_ ev_periodic *w) 1820ev_periodic_again (EV_P_ ev_periodic *w)
1653{ 1821{
1654 /* TODO: use adjustheap and recalculation */ 1822 /* TODO: use adjustheap and recalculation */
1655 ev_periodic_stop (EV_A_ w); 1823 ev_periodic_stop (EV_A_ w);
1656 ev_periodic_start (EV_A_ w); 1824 ev_periodic_start (EV_A_ w);
1659 1827
1660#ifndef SA_RESTART 1828#ifndef SA_RESTART
1661# define SA_RESTART 0 1829# define SA_RESTART 0
1662#endif 1830#endif
1663 1831
1664void 1832void noinline
1665ev_signal_start (EV_P_ ev_signal *w) 1833ev_signal_start (EV_P_ ev_signal *w)
1666{ 1834{
1667#if EV_MULTIPLICITY 1835#if EV_MULTIPLICITY
1668 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1836 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1669#endif 1837#endif
1670 if (expect_false (ev_is_active (w))) 1838 if (expect_false (ev_is_active (w)))
1671 return; 1839 return;
1672 1840
1673 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1841 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1674 1842
1843 {
1844#ifndef _WIN32
1845 sigset_t full, prev;
1846 sigfillset (&full);
1847 sigprocmask (SIG_SETMASK, &full, &prev);
1848#endif
1849
1850 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1851
1852#ifndef _WIN32
1853 sigprocmask (SIG_SETMASK, &prev, 0);
1854#endif
1855 }
1856
1675 ev_start (EV_A_ (W)w, 1); 1857 ev_start (EV_A_ (W)w, 1);
1676 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1677 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1858 wlist_add (&signals [w->signum - 1].head, (WL)w);
1678 1859
1679 if (!((WL)w)->next) 1860 if (!((WL)w)->next)
1680 { 1861 {
1681#if _WIN32 1862#if _WIN32
1682 signal (w->signum, sighandler); 1863 signal (w->signum, sighandler);
1688 sigaction (w->signum, &sa, 0); 1869 sigaction (w->signum, &sa, 0);
1689#endif 1870#endif
1690 } 1871 }
1691} 1872}
1692 1873
1693void 1874void noinline
1694ev_signal_stop (EV_P_ ev_signal *w) 1875ev_signal_stop (EV_P_ ev_signal *w)
1695{ 1876{
1696 ev_clear_pending (EV_A_ (W)w); 1877 clear_pending (EV_A_ (W)w);
1697 if (expect_false (!ev_is_active (w))) 1878 if (expect_false (!ev_is_active (w)))
1698 return; 1879 return;
1699 1880
1700 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1881 wlist_del (&signals [w->signum - 1].head, (WL)w);
1701 ev_stop (EV_A_ (W)w); 1882 ev_stop (EV_A_ (W)w);
1702 1883
1703 if (!signals [w->signum - 1].head) 1884 if (!signals [w->signum - 1].head)
1704 signal (w->signum, SIG_DFL); 1885 signal (w->signum, SIG_DFL);
1705} 1886}
1712#endif 1893#endif
1713 if (expect_false (ev_is_active (w))) 1894 if (expect_false (ev_is_active (w)))
1714 return; 1895 return;
1715 1896
1716 ev_start (EV_A_ (W)w, 1); 1897 ev_start (EV_A_ (W)w, 1);
1717 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1898 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1718} 1899}
1719 1900
1720void 1901void
1721ev_child_stop (EV_P_ ev_child *w) 1902ev_child_stop (EV_P_ ev_child *w)
1722{ 1903{
1723 ev_clear_pending (EV_A_ (W)w); 1904 clear_pending (EV_A_ (W)w);
1724 if (expect_false (!ev_is_active (w))) 1905 if (expect_false (!ev_is_active (w)))
1725 return; 1906 return;
1726 1907
1727 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1908 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1728 ev_stop (EV_A_ (W)w); 1909 ev_stop (EV_A_ (W)w);
1729} 1910}
1730 1911
1731#if EV_STAT_ENABLE 1912#if EV_STAT_ENABLE
1732 1913
1964} 2145}
1965 2146
1966void 2147void
1967ev_stat_stop (EV_P_ ev_stat *w) 2148ev_stat_stop (EV_P_ ev_stat *w)
1968{ 2149{
1969 ev_clear_pending (EV_A_ (W)w); 2150 clear_pending (EV_A_ (W)w);
1970 if (expect_false (!ev_is_active (w))) 2151 if (expect_false (!ev_is_active (w)))
1971 return; 2152 return;
1972 2153
1973#if EV_USE_INOTIFY 2154#if EV_USE_INOTIFY
1974 infy_del (EV_A_ w); 2155 infy_del (EV_A_ w);
1977 2158
1978 ev_stop (EV_A_ (W)w); 2159 ev_stop (EV_A_ (W)w);
1979} 2160}
1980#endif 2161#endif
1981 2162
2163#if EV_IDLE_ENABLE
1982void 2164void
1983ev_idle_start (EV_P_ ev_idle *w) 2165ev_idle_start (EV_P_ ev_idle *w)
1984{ 2166{
1985 if (expect_false (ev_is_active (w))) 2167 if (expect_false (ev_is_active (w)))
1986 return; 2168 return;
1987 2169
2170 pri_adjust (EV_A_ (W)w);
2171
2172 {
2173 int active = ++idlecnt [ABSPRI (w)];
2174
2175 ++idleall;
1988 ev_start (EV_A_ (W)w, ++idlecnt); 2176 ev_start (EV_A_ (W)w, active);
2177
1989 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2178 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1990 idles [idlecnt - 1] = w; 2179 idles [ABSPRI (w)][active - 1] = w;
2180 }
1991} 2181}
1992 2182
1993void 2183void
1994ev_idle_stop (EV_P_ ev_idle *w) 2184ev_idle_stop (EV_P_ ev_idle *w)
1995{ 2185{
1996 ev_clear_pending (EV_A_ (W)w); 2186 clear_pending (EV_A_ (W)w);
1997 if (expect_false (!ev_is_active (w))) 2187 if (expect_false (!ev_is_active (w)))
1998 return; 2188 return;
1999 2189
2000 { 2190 {
2001 int active = ((W)w)->active; 2191 int active = ((W)w)->active;
2002 idles [active - 1] = idles [--idlecnt]; 2192
2193 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2003 ((W)idles [active - 1])->active = active; 2194 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2195
2196 ev_stop (EV_A_ (W)w);
2197 --idleall;
2004 } 2198 }
2005
2006 ev_stop (EV_A_ (W)w);
2007} 2199}
2200#endif
2008 2201
2009void 2202void
2010ev_prepare_start (EV_P_ ev_prepare *w) 2203ev_prepare_start (EV_P_ ev_prepare *w)
2011{ 2204{
2012 if (expect_false (ev_is_active (w))) 2205 if (expect_false (ev_is_active (w)))
2018} 2211}
2019 2212
2020void 2213void
2021ev_prepare_stop (EV_P_ ev_prepare *w) 2214ev_prepare_stop (EV_P_ ev_prepare *w)
2022{ 2215{
2023 ev_clear_pending (EV_A_ (W)w); 2216 clear_pending (EV_A_ (W)w);
2024 if (expect_false (!ev_is_active (w))) 2217 if (expect_false (!ev_is_active (w)))
2025 return; 2218 return;
2026 2219
2027 { 2220 {
2028 int active = ((W)w)->active; 2221 int active = ((W)w)->active;
2045} 2238}
2046 2239
2047void 2240void
2048ev_check_stop (EV_P_ ev_check *w) 2241ev_check_stop (EV_P_ ev_check *w)
2049{ 2242{
2050 ev_clear_pending (EV_A_ (W)w); 2243 clear_pending (EV_A_ (W)w);
2051 if (expect_false (!ev_is_active (w))) 2244 if (expect_false (!ev_is_active (w)))
2052 return; 2245 return;
2053 2246
2054 { 2247 {
2055 int active = ((W)w)->active; 2248 int active = ((W)w)->active;
2062 2255
2063#if EV_EMBED_ENABLE 2256#if EV_EMBED_ENABLE
2064void noinline 2257void noinline
2065ev_embed_sweep (EV_P_ ev_embed *w) 2258ev_embed_sweep (EV_P_ ev_embed *w)
2066{ 2259{
2067 ev_loop (w->loop, EVLOOP_NONBLOCK); 2260 ev_loop (w->other, EVLOOP_NONBLOCK);
2068} 2261}
2069 2262
2070static void 2263static void
2071embed_cb (EV_P_ ev_io *io, int revents) 2264embed_io_cb (EV_P_ ev_io *io, int revents)
2072{ 2265{
2073 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2266 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2074 2267
2075 if (ev_cb (w)) 2268 if (ev_cb (w))
2076 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2269 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2077 else 2270 else
2078 ev_embed_sweep (loop, w); 2271 ev_embed_sweep (loop, w);
2079} 2272}
2080 2273
2274static void
2275embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2276{
2277 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2278
2279 fd_reify (w->other);
2280}
2281
2081void 2282void
2082ev_embed_start (EV_P_ ev_embed *w) 2283ev_embed_start (EV_P_ ev_embed *w)
2083{ 2284{
2084 if (expect_false (ev_is_active (w))) 2285 if (expect_false (ev_is_active (w)))
2085 return; 2286 return;
2086 2287
2087 { 2288 {
2088 struct ev_loop *loop = w->loop; 2289 struct ev_loop *loop = w->other;
2089 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2290 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2090 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2291 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2091 } 2292 }
2092 2293
2093 ev_set_priority (&w->io, ev_priority (w)); 2294 ev_set_priority (&w->io, ev_priority (w));
2094 ev_io_start (EV_A_ &w->io); 2295 ev_io_start (EV_A_ &w->io);
2095 2296
2297 ev_prepare_init (&w->prepare, embed_prepare_cb);
2298 ev_set_priority (&w->prepare, EV_MINPRI);
2299 ev_prepare_start (EV_A_ &w->prepare);
2300
2096 ev_start (EV_A_ (W)w, 1); 2301 ev_start (EV_A_ (W)w, 1);
2097} 2302}
2098 2303
2099void 2304void
2100ev_embed_stop (EV_P_ ev_embed *w) 2305ev_embed_stop (EV_P_ ev_embed *w)
2101{ 2306{
2102 ev_clear_pending (EV_A_ (W)w); 2307 clear_pending (EV_A_ (W)w);
2103 if (expect_false (!ev_is_active (w))) 2308 if (expect_false (!ev_is_active (w)))
2104 return; 2309 return;
2105 2310
2106 ev_io_stop (EV_A_ &w->io); 2311 ev_io_stop (EV_A_ &w->io);
2312 ev_prepare_stop (EV_A_ &w->prepare);
2107 2313
2108 ev_stop (EV_A_ (W)w); 2314 ev_stop (EV_A_ (W)w);
2109} 2315}
2110#endif 2316#endif
2111 2317
2122} 2328}
2123 2329
2124void 2330void
2125ev_fork_stop (EV_P_ ev_fork *w) 2331ev_fork_stop (EV_P_ ev_fork *w)
2126{ 2332{
2127 ev_clear_pending (EV_A_ (W)w); 2333 clear_pending (EV_A_ (W)w);
2128 if (expect_false (!ev_is_active (w))) 2334 if (expect_false (!ev_is_active (w)))
2129 return; 2335 return;
2130 2336
2131 { 2337 {
2132 int active = ((W)w)->active; 2338 int active = ((W)w)->active;
2200 ev_timer_set (&once->to, timeout, 0.); 2406 ev_timer_set (&once->to, timeout, 0.);
2201 ev_timer_start (EV_A_ &once->to); 2407 ev_timer_start (EV_A_ &once->to);
2202 } 2408 }
2203} 2409}
2204 2410
2411#if EV_MULTIPLICITY
2412 #include "ev_wrap.h"
2413#endif
2414
2205#ifdef __cplusplus 2415#ifdef __cplusplus
2206} 2416}
2207#endif 2417#endif
2208 2418

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines