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

Comparing libev/ev.c (file contents):
Revision 1.160 by root, Sat Dec 1 22:57:20 2007 UTC vs.
Revision 1.197 by root, Sat Dec 22 15:20:13 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{
880 return EVBACKEND_EPOLL 977 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
881 | EVBACKEND_KQUEUE 978
882 | EVBACKEND_PORT; 979 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
980 /* please fix it and tell me how to detect the fix */
981 flags &= ~EVBACKEND_EPOLL;
982
983 return flags;
883} 984}
884 985
885unsigned int 986unsigned int
886ev_backend (EV_P) 987ev_backend (EV_P)
887{ 988{
888 return backend; 989 return backend;
990}
991
992unsigned int
993ev_loop_count (EV_P)
994{
995 return loop_count;
996}
997
998void
999ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1000{
1001 io_blocktime = interval;
1002}
1003
1004void
1005ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1006{
1007 timeout_blocktime = interval;
889} 1008}
890 1009
891static void noinline 1010static void noinline
892loop_init (EV_P_ unsigned int flags) 1011loop_init (EV_P_ unsigned int flags)
893{ 1012{
904 ev_rt_now = ev_time (); 1023 ev_rt_now = ev_time ();
905 mn_now = get_clock (); 1024 mn_now = get_clock ();
906 now_floor = mn_now; 1025 now_floor = mn_now;
907 rtmn_diff = ev_rt_now - mn_now; 1026 rtmn_diff = ev_rt_now - mn_now;
908 1027
1028 io_blocktime = 0.;
1029 timeout_blocktime = 0.;
1030
909 /* pid check not overridable via env */ 1031 /* pid check not overridable via env */
910#ifndef _WIN32 1032#ifndef _WIN32
911 if (flags & EVFLAG_FORKCHECK) 1033 if (flags & EVFLAG_FORKCHECK)
912 curpid = getpid (); 1034 curpid = getpid ();
913#endif 1035#endif
975#if EV_USE_SELECT 1097#if EV_USE_SELECT
976 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1098 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
977#endif 1099#endif
978 1100
979 for (i = NUMPRI; i--; ) 1101 for (i = NUMPRI; i--; )
1102 {
980 array_free (pending, [i]); 1103 array_free (pending, [i]);
1104#if EV_IDLE_ENABLE
1105 array_free (idle, [i]);
1106#endif
1107 }
1108
1109 ev_free (anfds); anfdmax = 0;
981 1110
982 /* have to use the microsoft-never-gets-it-right macro */ 1111 /* have to use the microsoft-never-gets-it-right macro */
983 array_free (fdchange, EMPTY0); 1112 array_free (fdchange, EMPTY);
984 array_free (timer, EMPTY0); 1113 array_free (timer, EMPTY);
985#if EV_PERIODIC_ENABLE 1114#if EV_PERIODIC_ENABLE
986 array_free (periodic, EMPTY0); 1115 array_free (periodic, EMPTY);
987#endif 1116#endif
1117#if EV_FORK_ENABLE
988 array_free (idle, EMPTY0); 1118 array_free (fork, EMPTY);
1119#endif
989 array_free (prepare, EMPTY0); 1120 array_free (prepare, EMPTY);
990 array_free (check, EMPTY0); 1121 array_free (check, EMPTY);
991 1122
992 backend = 0; 1123 backend = 0;
993} 1124}
994 1125
995void inline_size infy_fork (EV_P); 1126void inline_size infy_fork (EV_P);
1131 postfork = 1; 1262 postfork = 1;
1132} 1263}
1133 1264
1134/*****************************************************************************/ 1265/*****************************************************************************/
1135 1266
1136int inline_size 1267void
1137any_pending (EV_P) 1268ev_invoke (EV_P_ void *w, int revents)
1138{ 1269{
1139 int pri; 1270 EV_CB_INVOKE ((W)w, revents);
1140
1141 for (pri = NUMPRI; pri--; )
1142 if (pendingcnt [pri])
1143 return 1;
1144
1145 return 0;
1146} 1271}
1147 1272
1148void inline_speed 1273void inline_speed
1149call_pending (EV_P) 1274call_pending (EV_P)
1150{ 1275{
1168void inline_size 1293void inline_size
1169timers_reify (EV_P) 1294timers_reify (EV_P)
1170{ 1295{
1171 while (timercnt && ((WT)timers [0])->at <= mn_now) 1296 while (timercnt && ((WT)timers [0])->at <= mn_now)
1172 { 1297 {
1173 ev_timer *w = timers [0]; 1298 ev_timer *w = (ev_timer *)timers [0];
1174 1299
1175 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1300 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1176 1301
1177 /* first reschedule or stop timer */ 1302 /* first reschedule or stop timer */
1178 if (w->repeat) 1303 if (w->repeat)
1181 1306
1182 ((WT)w)->at += w->repeat; 1307 ((WT)w)->at += w->repeat;
1183 if (((WT)w)->at < mn_now) 1308 if (((WT)w)->at < mn_now)
1184 ((WT)w)->at = mn_now; 1309 ((WT)w)->at = mn_now;
1185 1310
1186 downheap ((WT *)timers, timercnt, 0); 1311 downheap (timers, timercnt, 0);
1187 } 1312 }
1188 else 1313 else
1189 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1314 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1190 1315
1191 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1316 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1196void inline_size 1321void inline_size
1197periodics_reify (EV_P) 1322periodics_reify (EV_P)
1198{ 1323{
1199 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1324 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1200 { 1325 {
1201 ev_periodic *w = periodics [0]; 1326 ev_periodic *w = (ev_periodic *)periodics [0];
1202 1327
1203 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1328 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1204 1329
1205 /* first reschedule or stop timer */ 1330 /* first reschedule or stop timer */
1206 if (w->reschedule_cb) 1331 if (w->reschedule_cb)
1207 { 1332 {
1208 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1333 ((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)); 1334 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1210 downheap ((WT *)periodics, periodiccnt, 0); 1335 downheap (periodics, periodiccnt, 0);
1211 } 1336 }
1212 else if (w->interval) 1337 else if (w->interval)
1213 { 1338 {
1214 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1339 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1340 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)); 1341 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); 1342 downheap (periodics, periodiccnt, 0);
1217 } 1343 }
1218 else 1344 else
1219 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1345 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1220 1346
1221 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1347 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1228 int i; 1354 int i;
1229 1355
1230 /* adjust periodics after time jump */ 1356 /* adjust periodics after time jump */
1231 for (i = 0; i < periodiccnt; ++i) 1357 for (i = 0; i < periodiccnt; ++i)
1232 { 1358 {
1233 ev_periodic *w = periodics [i]; 1359 ev_periodic *w = (ev_periodic *)periodics [i];
1234 1360
1235 if (w->reschedule_cb) 1361 if (w->reschedule_cb)
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1362 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1237 else if (w->interval) 1363 else if (w->interval)
1238 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1364 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1239 } 1365 }
1240 1366
1241 /* now rebuild the heap */ 1367 /* now rebuild the heap */
1242 for (i = periodiccnt >> 1; i--; ) 1368 for (i = periodiccnt >> 1; i--; )
1243 downheap ((WT *)periodics, periodiccnt, i); 1369 downheap (periodics, periodiccnt, i);
1244} 1370}
1245#endif 1371#endif
1246 1372
1373#if EV_IDLE_ENABLE
1247int inline_size 1374void inline_size
1248time_update_monotonic (EV_P) 1375idle_reify (EV_P)
1249{ 1376{
1377 if (expect_false (idleall))
1378 {
1379 int pri;
1380
1381 for (pri = NUMPRI; pri--; )
1382 {
1383 if (pendingcnt [pri])
1384 break;
1385
1386 if (idlecnt [pri])
1387 {
1388 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1389 break;
1390 }
1391 }
1392 }
1393}
1394#endif
1395
1396void inline_speed
1397time_update (EV_P_ ev_tstamp max_block)
1398{
1399 int i;
1400
1401#if EV_USE_MONOTONIC
1402 if (expect_true (have_monotonic))
1403 {
1404 ev_tstamp odiff = rtmn_diff;
1405
1250 mn_now = get_clock (); 1406 mn_now = get_clock ();
1251 1407
1408 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1409 /* interpolate in the meantime */
1252 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1410 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1253 { 1411 {
1254 ev_rt_now = rtmn_diff + mn_now; 1412 ev_rt_now = rtmn_diff + mn_now;
1255 return 0; 1413 return;
1256 } 1414 }
1257 else 1415
1258 {
1259 now_floor = mn_now; 1416 now_floor = mn_now;
1260 ev_rt_now = ev_time (); 1417 ev_rt_now = ev_time ();
1261 return 1;
1262 }
1263}
1264 1418
1265void inline_size 1419 /* loop a few times, before making important decisions.
1266time_update (EV_P) 1420 * on the choice of "4": one iteration isn't enough,
1267{ 1421 * in case we get preempted during the calls to
1268 int i; 1422 * ev_time and get_clock. a second call is almost guaranteed
1269 1423 * to succeed in that case, though. and looping a few more times
1270#if EV_USE_MONOTONIC 1424 * doesn't hurt either as we only do this on time-jumps or
1271 if (expect_true (have_monotonic)) 1425 * in the unlikely event of having been preempted here.
1272 { 1426 */
1273 if (time_update_monotonic (EV_A)) 1427 for (i = 4; --i; )
1274 { 1428 {
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; 1429 rtmn_diff = ev_rt_now - mn_now;
1288 1430
1289 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1431 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1290 return; /* all is well */ 1432 return; /* all is well */
1291 1433
1292 ev_rt_now = ev_time (); 1434 ev_rt_now = ev_time ();
1293 mn_now = get_clock (); 1435 mn_now = get_clock ();
1294 now_floor = mn_now; 1436 now_floor = mn_now;
1295 } 1437 }
1296 1438
1297# if EV_PERIODIC_ENABLE 1439# if EV_PERIODIC_ENABLE
1298 periodics_reschedule (EV_A); 1440 periodics_reschedule (EV_A);
1299# endif 1441# endif
1300 /* no timer adjustment, as the monotonic clock doesn't jump */ 1442 /* no timer adjustment, as the monotonic clock doesn't jump */
1301 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1443 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1302 }
1303 } 1444 }
1304 else 1445 else
1305#endif 1446#endif
1306 { 1447 {
1307 ev_rt_now = ev_time (); 1448 ev_rt_now = ev_time ();
1308 1449
1309 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1450 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1310 { 1451 {
1311#if EV_PERIODIC_ENABLE 1452#if EV_PERIODIC_ENABLE
1312 periodics_reschedule (EV_A); 1453 periodics_reschedule (EV_A);
1313#endif 1454#endif
1314
1315 /* adjust timers. this is easy, as the offset is the same for all of them */ 1455 /* adjust timers. this is easy, as the offset is the same for all of them */
1316 for (i = 0; i < timercnt; ++i) 1456 for (i = 0; i < timercnt; ++i)
1317 ((WT)timers [i])->at += ev_rt_now - mn_now; 1457 ((WT)timers [i])->at += ev_rt_now - mn_now;
1318 } 1458 }
1319 1459
1342 ? EVUNLOOP_ONE 1482 ? EVUNLOOP_ONE
1343 : EVUNLOOP_CANCEL; 1483 : EVUNLOOP_CANCEL;
1344 1484
1345 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1485 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1346 1486
1347 while (expect_false (!activecnt)) 1487 do
1348 { 1488 {
1349#ifndef _WIN32 1489#ifndef _WIN32
1350 if (expect_false (curpid)) /* penalise the forking check even more */ 1490 if (expect_false (curpid)) /* penalise the forking check even more */
1351 if (expect_false (getpid () != curpid)) 1491 if (expect_false (getpid () != curpid))
1352 { 1492 {
1363 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1503 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1364 call_pending (EV_A); 1504 call_pending (EV_A);
1365 } 1505 }
1366#endif 1506#endif
1367 1507
1368 /* queue check watchers (and execute them) */ 1508 /* queue prepare watchers (and execute them) */
1369 if (expect_false (preparecnt)) 1509 if (expect_false (preparecnt))
1370 { 1510 {
1371 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1511 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1372 call_pending (EV_A); 1512 call_pending (EV_A);
1373 } 1513 }
1382 /* update fd-related kernel structures */ 1522 /* update fd-related kernel structures */
1383 fd_reify (EV_A); 1523 fd_reify (EV_A);
1384 1524
1385 /* calculate blocking time */ 1525 /* calculate blocking time */
1386 { 1526 {
1387 ev_tstamp block; 1527 ev_tstamp waittime = 0.;
1528 ev_tstamp sleeptime = 0.;
1388 1529
1389 if (expect_false (flags & EVLOOP_NONBLOCK || idlecnt || !activecnt)) 1530 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1390 block = 0.; /* do not block at all */
1391 else
1392 { 1531 {
1393 /* update time to cancel out callback processing overhead */ 1532 /* 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); 1533 time_update (EV_A_ 1e100);
1397 else
1398#endif
1399 {
1400 ev_rt_now = ev_time ();
1401 mn_now = ev_rt_now;
1402 }
1403 1534
1404 block = MAX_BLOCKTIME; 1535 waittime = MAX_BLOCKTIME;
1405 1536
1406 if (timercnt) 1537 if (timercnt)
1407 { 1538 {
1408 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1539 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1409 if (block > to) block = to; 1540 if (waittime > to) waittime = to;
1410 } 1541 }
1411 1542
1412#if EV_PERIODIC_ENABLE 1543#if EV_PERIODIC_ENABLE
1413 if (periodiccnt) 1544 if (periodiccnt)
1414 { 1545 {
1415 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1546 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1416 if (block > to) block = to; 1547 if (waittime > to) waittime = to;
1417 } 1548 }
1418#endif 1549#endif
1419 1550
1420 if (expect_false (block < 0.)) block = 0.; 1551 if (expect_false (waittime < timeout_blocktime))
1552 waittime = timeout_blocktime;
1553
1554 sleeptime = waittime - backend_fudge;
1555
1556 if (expect_true (sleeptime > io_blocktime))
1557 sleeptime = io_blocktime;
1558
1559 if (sleeptime)
1560 {
1561 ev_sleep (sleeptime);
1562 waittime -= sleeptime;
1563 }
1421 } 1564 }
1422 1565
1566 ++loop_count;
1423 backend_poll (EV_A_ block); 1567 backend_poll (EV_A_ waittime);
1568
1569 /* update ev_rt_now, do magic */
1570 time_update (EV_A_ waittime + sleeptime);
1424 } 1571 }
1425
1426 /* update ev_rt_now, do magic */
1427 time_update (EV_A);
1428 1572
1429 /* queue pending timers and reschedule them */ 1573 /* queue pending timers and reschedule them */
1430 timers_reify (EV_A); /* relative timers called last */ 1574 timers_reify (EV_A); /* relative timers called last */
1431#if EV_PERIODIC_ENABLE 1575#if EV_PERIODIC_ENABLE
1432 periodics_reify (EV_A); /* absolute timers called first */ 1576 periodics_reify (EV_A); /* absolute timers called first */
1433#endif 1577#endif
1434 1578
1579#if EV_IDLE_ENABLE
1435 /* queue idle watchers unless other events are pending */ 1580 /* queue idle watchers unless other events are pending */
1436 if (idlecnt && !any_pending (EV_A)) 1581 idle_reify (EV_A);
1437 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1582#endif
1438 1583
1439 /* queue check watchers, to be executed first */ 1584 /* queue check watchers, to be executed first */
1440 if (expect_false (checkcnt)) 1585 if (expect_false (checkcnt))
1441 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1586 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1442 1587
1443 call_pending (EV_A); 1588 call_pending (EV_A);
1444 1589
1445 if (expect_false (loop_done))
1446 break;
1447 } 1590 }
1591 while (expect_true (activecnt && !loop_done));
1448 1592
1449 if (loop_done == EVUNLOOP_ONE) 1593 if (loop_done == EVUNLOOP_ONE)
1450 loop_done = EVUNLOOP_CANCEL; 1594 loop_done = EVUNLOOP_CANCEL;
1451} 1595}
1452 1596
1479 head = &(*head)->next; 1623 head = &(*head)->next;
1480 } 1624 }
1481} 1625}
1482 1626
1483void inline_speed 1627void inline_speed
1484ev_clear_pending (EV_P_ W w) 1628clear_pending (EV_P_ W w)
1485{ 1629{
1486 if (w->pending) 1630 if (w->pending)
1487 { 1631 {
1488 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1632 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1489 w->pending = 0; 1633 w->pending = 0;
1490 } 1634 }
1491} 1635}
1492 1636
1637int
1638ev_clear_pending (EV_P_ void *w)
1639{
1640 W w_ = (W)w;
1641 int pending = w_->pending;
1642
1643 if (expect_true (pending))
1644 {
1645 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1646 w_->pending = 0;
1647 p->w = 0;
1648 return p->events;
1649 }
1650 else
1651 return 0;
1652}
1653
1654void inline_size
1655pri_adjust (EV_P_ W w)
1656{
1657 int pri = w->priority;
1658 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1659 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1660 w->priority = pri;
1661}
1662
1493void inline_speed 1663void inline_speed
1494ev_start (EV_P_ W w, int active) 1664ev_start (EV_P_ W w, int active)
1495{ 1665{
1496 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1666 pri_adjust (EV_A_ w);
1497 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1498
1499 w->active = active; 1667 w->active = active;
1500 ev_ref (EV_A); 1668 ev_ref (EV_A);
1501} 1669}
1502 1670
1503void inline_size 1671void inline_size
1507 w->active = 0; 1675 w->active = 0;
1508} 1676}
1509 1677
1510/*****************************************************************************/ 1678/*****************************************************************************/
1511 1679
1512void 1680void noinline
1513ev_io_start (EV_P_ ev_io *w) 1681ev_io_start (EV_P_ ev_io *w)
1514{ 1682{
1515 int fd = w->fd; 1683 int fd = w->fd;
1516 1684
1517 if (expect_false (ev_is_active (w))) 1685 if (expect_false (ev_is_active (w)))
1519 1687
1520 assert (("ev_io_start called with negative fd", fd >= 0)); 1688 assert (("ev_io_start called with negative fd", fd >= 0));
1521 1689
1522 ev_start (EV_A_ (W)w, 1); 1690 ev_start (EV_A_ (W)w, 1);
1523 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1691 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1524 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1692 wlist_add (&anfds[fd].head, (WL)w);
1525 1693
1526 fd_change (EV_A_ fd); 1694 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1695 w->events &= ~EV_IOFDSET;
1527} 1696}
1528 1697
1529void 1698void noinline
1530ev_io_stop (EV_P_ ev_io *w) 1699ev_io_stop (EV_P_ ev_io *w)
1531{ 1700{
1532 ev_clear_pending (EV_A_ (W)w); 1701 clear_pending (EV_A_ (W)w);
1533 if (expect_false (!ev_is_active (w))) 1702 if (expect_false (!ev_is_active (w)))
1534 return; 1703 return;
1535 1704
1536 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1705 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1537 1706
1538 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1707 wlist_del (&anfds[w->fd].head, (WL)w);
1539 ev_stop (EV_A_ (W)w); 1708 ev_stop (EV_A_ (W)w);
1540 1709
1541 fd_change (EV_A_ w->fd); 1710 fd_change (EV_A_ w->fd, 1);
1542} 1711}
1543 1712
1544void 1713void noinline
1545ev_timer_start (EV_P_ ev_timer *w) 1714ev_timer_start (EV_P_ ev_timer *w)
1546{ 1715{
1547 if (expect_false (ev_is_active (w))) 1716 if (expect_false (ev_is_active (w)))
1548 return; 1717 return;
1549 1718
1550 ((WT)w)->at += mn_now; 1719 ((WT)w)->at += mn_now;
1551 1720
1552 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1721 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1553 1722
1554 ev_start (EV_A_ (W)w, ++timercnt); 1723 ev_start (EV_A_ (W)w, ++timercnt);
1555 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1724 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1556 timers [timercnt - 1] = w; 1725 timers [timercnt - 1] = (WT)w;
1557 upheap ((WT *)timers, timercnt - 1); 1726 upheap (timers, timercnt - 1);
1558 1727
1559 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1728 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1560} 1729}
1561 1730
1562void 1731void noinline
1563ev_timer_stop (EV_P_ ev_timer *w) 1732ev_timer_stop (EV_P_ ev_timer *w)
1564{ 1733{
1565 ev_clear_pending (EV_A_ (W)w); 1734 clear_pending (EV_A_ (W)w);
1566 if (expect_false (!ev_is_active (w))) 1735 if (expect_false (!ev_is_active (w)))
1567 return; 1736 return;
1568 1737
1569 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1738 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1570 1739
1571 { 1740 {
1572 int active = ((W)w)->active; 1741 int active = ((W)w)->active;
1573 1742
1574 if (expect_true (--active < --timercnt)) 1743 if (expect_true (--active < --timercnt))
1575 { 1744 {
1576 timers [active] = timers [timercnt]; 1745 timers [active] = timers [timercnt];
1577 adjustheap ((WT *)timers, timercnt, active); 1746 adjustheap (timers, timercnt, active);
1578 } 1747 }
1579 } 1748 }
1580 1749
1581 ((WT)w)->at -= mn_now; 1750 ((WT)w)->at -= mn_now;
1582 1751
1583 ev_stop (EV_A_ (W)w); 1752 ev_stop (EV_A_ (W)w);
1584} 1753}
1585 1754
1586void 1755void noinline
1587ev_timer_again (EV_P_ ev_timer *w) 1756ev_timer_again (EV_P_ ev_timer *w)
1588{ 1757{
1589 if (ev_is_active (w)) 1758 if (ev_is_active (w))
1590 { 1759 {
1591 if (w->repeat) 1760 if (w->repeat)
1592 { 1761 {
1593 ((WT)w)->at = mn_now + w->repeat; 1762 ((WT)w)->at = mn_now + w->repeat;
1594 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1763 adjustheap (timers, timercnt, ((W)w)->active - 1);
1595 } 1764 }
1596 else 1765 else
1597 ev_timer_stop (EV_A_ w); 1766 ev_timer_stop (EV_A_ w);
1598 } 1767 }
1599 else if (w->repeat) 1768 else if (w->repeat)
1602 ev_timer_start (EV_A_ w); 1771 ev_timer_start (EV_A_ w);
1603 } 1772 }
1604} 1773}
1605 1774
1606#if EV_PERIODIC_ENABLE 1775#if EV_PERIODIC_ENABLE
1607void 1776void noinline
1608ev_periodic_start (EV_P_ ev_periodic *w) 1777ev_periodic_start (EV_P_ ev_periodic *w)
1609{ 1778{
1610 if (expect_false (ev_is_active (w))) 1779 if (expect_false (ev_is_active (w)))
1611 return; 1780 return;
1612 1781
1614 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1783 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1615 else if (w->interval) 1784 else if (w->interval)
1616 { 1785 {
1617 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1786 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1618 /* this formula differs from the one in periodic_reify because we do not always round up */ 1787 /* this formula differs from the one in periodic_reify because we do not always round up */
1619 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1788 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1620 } 1789 }
1790 else
1791 ((WT)w)->at = w->offset;
1621 1792
1622 ev_start (EV_A_ (W)w, ++periodiccnt); 1793 ev_start (EV_A_ (W)w, ++periodiccnt);
1623 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1794 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1624 periodics [periodiccnt - 1] = w; 1795 periodics [periodiccnt - 1] = (WT)w;
1625 upheap ((WT *)periodics, periodiccnt - 1); 1796 upheap (periodics, periodiccnt - 1);
1626 1797
1627 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1798 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1628} 1799}
1629 1800
1630void 1801void noinline
1631ev_periodic_stop (EV_P_ ev_periodic *w) 1802ev_periodic_stop (EV_P_ ev_periodic *w)
1632{ 1803{
1633 ev_clear_pending (EV_A_ (W)w); 1804 clear_pending (EV_A_ (W)w);
1634 if (expect_false (!ev_is_active (w))) 1805 if (expect_false (!ev_is_active (w)))
1635 return; 1806 return;
1636 1807
1637 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1808 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1638 1809
1639 { 1810 {
1640 int active = ((W)w)->active; 1811 int active = ((W)w)->active;
1641 1812
1642 if (expect_true (--active < --periodiccnt)) 1813 if (expect_true (--active < --periodiccnt))
1643 { 1814 {
1644 periodics [active] = periodics [periodiccnt]; 1815 periodics [active] = periodics [periodiccnt];
1645 adjustheap ((WT *)periodics, periodiccnt, active); 1816 adjustheap (periodics, periodiccnt, active);
1646 } 1817 }
1647 } 1818 }
1648 1819
1649 ev_stop (EV_A_ (W)w); 1820 ev_stop (EV_A_ (W)w);
1650} 1821}
1651 1822
1652void 1823void noinline
1653ev_periodic_again (EV_P_ ev_periodic *w) 1824ev_periodic_again (EV_P_ ev_periodic *w)
1654{ 1825{
1655 /* TODO: use adjustheap and recalculation */ 1826 /* TODO: use adjustheap and recalculation */
1656 ev_periodic_stop (EV_A_ w); 1827 ev_periodic_stop (EV_A_ w);
1657 ev_periodic_start (EV_A_ w); 1828 ev_periodic_start (EV_A_ w);
1660 1831
1661#ifndef SA_RESTART 1832#ifndef SA_RESTART
1662# define SA_RESTART 0 1833# define SA_RESTART 0
1663#endif 1834#endif
1664 1835
1665void 1836void noinline
1666ev_signal_start (EV_P_ ev_signal *w) 1837ev_signal_start (EV_P_ ev_signal *w)
1667{ 1838{
1668#if EV_MULTIPLICITY 1839#if EV_MULTIPLICITY
1669 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1840 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1670#endif 1841#endif
1671 if (expect_false (ev_is_active (w))) 1842 if (expect_false (ev_is_active (w)))
1672 return; 1843 return;
1673 1844
1674 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1845 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1675 1846
1847 {
1848#ifndef _WIN32
1849 sigset_t full, prev;
1850 sigfillset (&full);
1851 sigprocmask (SIG_SETMASK, &full, &prev);
1852#endif
1853
1854 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1855
1856#ifndef _WIN32
1857 sigprocmask (SIG_SETMASK, &prev, 0);
1858#endif
1859 }
1860
1676 ev_start (EV_A_ (W)w, 1); 1861 ev_start (EV_A_ (W)w, 1);
1677 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1678 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1862 wlist_add (&signals [w->signum - 1].head, (WL)w);
1679 1863
1680 if (!((WL)w)->next) 1864 if (!((WL)w)->next)
1681 { 1865 {
1682#if _WIN32 1866#if _WIN32
1683 signal (w->signum, sighandler); 1867 signal (w->signum, sighandler);
1689 sigaction (w->signum, &sa, 0); 1873 sigaction (w->signum, &sa, 0);
1690#endif 1874#endif
1691 } 1875 }
1692} 1876}
1693 1877
1694void 1878void noinline
1695ev_signal_stop (EV_P_ ev_signal *w) 1879ev_signal_stop (EV_P_ ev_signal *w)
1696{ 1880{
1697 ev_clear_pending (EV_A_ (W)w); 1881 clear_pending (EV_A_ (W)w);
1698 if (expect_false (!ev_is_active (w))) 1882 if (expect_false (!ev_is_active (w)))
1699 return; 1883 return;
1700 1884
1701 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1885 wlist_del (&signals [w->signum - 1].head, (WL)w);
1702 ev_stop (EV_A_ (W)w); 1886 ev_stop (EV_A_ (W)w);
1703 1887
1704 if (!signals [w->signum - 1].head) 1888 if (!signals [w->signum - 1].head)
1705 signal (w->signum, SIG_DFL); 1889 signal (w->signum, SIG_DFL);
1706} 1890}
1713#endif 1897#endif
1714 if (expect_false (ev_is_active (w))) 1898 if (expect_false (ev_is_active (w)))
1715 return; 1899 return;
1716 1900
1717 ev_start (EV_A_ (W)w, 1); 1901 ev_start (EV_A_ (W)w, 1);
1718 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1902 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1719} 1903}
1720 1904
1721void 1905void
1722ev_child_stop (EV_P_ ev_child *w) 1906ev_child_stop (EV_P_ ev_child *w)
1723{ 1907{
1724 ev_clear_pending (EV_A_ (W)w); 1908 clear_pending (EV_A_ (W)w);
1725 if (expect_false (!ev_is_active (w))) 1909 if (expect_false (!ev_is_active (w)))
1726 return; 1910 return;
1727 1911
1728 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1912 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1729 ev_stop (EV_A_ (W)w); 1913 ev_stop (EV_A_ (W)w);
1730} 1914}
1731 1915
1732#if EV_STAT_ENABLE 1916#if EV_STAT_ENABLE
1733 1917
1965} 2149}
1966 2150
1967void 2151void
1968ev_stat_stop (EV_P_ ev_stat *w) 2152ev_stat_stop (EV_P_ ev_stat *w)
1969{ 2153{
1970 ev_clear_pending (EV_A_ (W)w); 2154 clear_pending (EV_A_ (W)w);
1971 if (expect_false (!ev_is_active (w))) 2155 if (expect_false (!ev_is_active (w)))
1972 return; 2156 return;
1973 2157
1974#if EV_USE_INOTIFY 2158#if EV_USE_INOTIFY
1975 infy_del (EV_A_ w); 2159 infy_del (EV_A_ w);
1978 2162
1979 ev_stop (EV_A_ (W)w); 2163 ev_stop (EV_A_ (W)w);
1980} 2164}
1981#endif 2165#endif
1982 2166
2167#if EV_IDLE_ENABLE
1983void 2168void
1984ev_idle_start (EV_P_ ev_idle *w) 2169ev_idle_start (EV_P_ ev_idle *w)
1985{ 2170{
1986 if (expect_false (ev_is_active (w))) 2171 if (expect_false (ev_is_active (w)))
1987 return; 2172 return;
1988 2173
2174 pri_adjust (EV_A_ (W)w);
2175
2176 {
2177 int active = ++idlecnt [ABSPRI (w)];
2178
2179 ++idleall;
1989 ev_start (EV_A_ (W)w, ++idlecnt); 2180 ev_start (EV_A_ (W)w, active);
2181
1990 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2182 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1991 idles [idlecnt - 1] = w; 2183 idles [ABSPRI (w)][active - 1] = w;
2184 }
1992} 2185}
1993 2186
1994void 2187void
1995ev_idle_stop (EV_P_ ev_idle *w) 2188ev_idle_stop (EV_P_ ev_idle *w)
1996{ 2189{
1997 ev_clear_pending (EV_A_ (W)w); 2190 clear_pending (EV_A_ (W)w);
1998 if (expect_false (!ev_is_active (w))) 2191 if (expect_false (!ev_is_active (w)))
1999 return; 2192 return;
2000 2193
2001 { 2194 {
2002 int active = ((W)w)->active; 2195 int active = ((W)w)->active;
2003 idles [active - 1] = idles [--idlecnt]; 2196
2197 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2004 ((W)idles [active - 1])->active = active; 2198 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2199
2200 ev_stop (EV_A_ (W)w);
2201 --idleall;
2005 } 2202 }
2006
2007 ev_stop (EV_A_ (W)w);
2008} 2203}
2204#endif
2009 2205
2010void 2206void
2011ev_prepare_start (EV_P_ ev_prepare *w) 2207ev_prepare_start (EV_P_ ev_prepare *w)
2012{ 2208{
2013 if (expect_false (ev_is_active (w))) 2209 if (expect_false (ev_is_active (w)))
2019} 2215}
2020 2216
2021void 2217void
2022ev_prepare_stop (EV_P_ ev_prepare *w) 2218ev_prepare_stop (EV_P_ ev_prepare *w)
2023{ 2219{
2024 ev_clear_pending (EV_A_ (W)w); 2220 clear_pending (EV_A_ (W)w);
2025 if (expect_false (!ev_is_active (w))) 2221 if (expect_false (!ev_is_active (w)))
2026 return; 2222 return;
2027 2223
2028 { 2224 {
2029 int active = ((W)w)->active; 2225 int active = ((W)w)->active;
2046} 2242}
2047 2243
2048void 2244void
2049ev_check_stop (EV_P_ ev_check *w) 2245ev_check_stop (EV_P_ ev_check *w)
2050{ 2246{
2051 ev_clear_pending (EV_A_ (W)w); 2247 clear_pending (EV_A_ (W)w);
2052 if (expect_false (!ev_is_active (w))) 2248 if (expect_false (!ev_is_active (w)))
2053 return; 2249 return;
2054 2250
2055 { 2251 {
2056 int active = ((W)w)->active; 2252 int active = ((W)w)->active;
2063 2259
2064#if EV_EMBED_ENABLE 2260#if EV_EMBED_ENABLE
2065void noinline 2261void noinline
2066ev_embed_sweep (EV_P_ ev_embed *w) 2262ev_embed_sweep (EV_P_ ev_embed *w)
2067{ 2263{
2068 ev_loop (w->loop, EVLOOP_NONBLOCK); 2264 ev_loop (w->other, EVLOOP_NONBLOCK);
2069} 2265}
2070 2266
2071static void 2267static void
2072embed_cb (EV_P_ ev_io *io, int revents) 2268embed_io_cb (EV_P_ ev_io *io, int revents)
2073{ 2269{
2074 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2270 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2075 2271
2076 if (ev_cb (w)) 2272 if (ev_cb (w))
2077 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2273 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2078 else 2274 else
2079 ev_embed_sweep (loop, w); 2275 ev_loop (w->other, EVLOOP_NONBLOCK);
2080} 2276}
2277
2278static void
2279embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2280{
2281 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2282
2283 {
2284 struct ev_loop *loop = w->other;
2285
2286 while (fdchangecnt)
2287 {
2288 fd_reify (EV_A);
2289 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2290 }
2291 }
2292}
2293
2294#if 0
2295static void
2296embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2297{
2298 ev_idle_stop (EV_A_ idle);
2299}
2300#endif
2081 2301
2082void 2302void
2083ev_embed_start (EV_P_ ev_embed *w) 2303ev_embed_start (EV_P_ ev_embed *w)
2084{ 2304{
2085 if (expect_false (ev_is_active (w))) 2305 if (expect_false (ev_is_active (w)))
2086 return; 2306 return;
2087 2307
2088 { 2308 {
2089 struct ev_loop *loop = w->loop; 2309 struct ev_loop *loop = w->other;
2090 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2310 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2091 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2311 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2092 } 2312 }
2093 2313
2094 ev_set_priority (&w->io, ev_priority (w)); 2314 ev_set_priority (&w->io, ev_priority (w));
2095 ev_io_start (EV_A_ &w->io); 2315 ev_io_start (EV_A_ &w->io);
2096 2316
2317 ev_prepare_init (&w->prepare, embed_prepare_cb);
2318 ev_set_priority (&w->prepare, EV_MINPRI);
2319 ev_prepare_start (EV_A_ &w->prepare);
2320
2321 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2322
2097 ev_start (EV_A_ (W)w, 1); 2323 ev_start (EV_A_ (W)w, 1);
2098} 2324}
2099 2325
2100void 2326void
2101ev_embed_stop (EV_P_ ev_embed *w) 2327ev_embed_stop (EV_P_ ev_embed *w)
2102{ 2328{
2103 ev_clear_pending (EV_A_ (W)w); 2329 clear_pending (EV_A_ (W)w);
2104 if (expect_false (!ev_is_active (w))) 2330 if (expect_false (!ev_is_active (w)))
2105 return; 2331 return;
2106 2332
2107 ev_io_stop (EV_A_ &w->io); 2333 ev_io_stop (EV_A_ &w->io);
2334 ev_prepare_stop (EV_A_ &w->prepare);
2108 2335
2109 ev_stop (EV_A_ (W)w); 2336 ev_stop (EV_A_ (W)w);
2110} 2337}
2111#endif 2338#endif
2112 2339
2123} 2350}
2124 2351
2125void 2352void
2126ev_fork_stop (EV_P_ ev_fork *w) 2353ev_fork_stop (EV_P_ ev_fork *w)
2127{ 2354{
2128 ev_clear_pending (EV_A_ (W)w); 2355 clear_pending (EV_A_ (W)w);
2129 if (expect_false (!ev_is_active (w))) 2356 if (expect_false (!ev_is_active (w)))
2130 return; 2357 return;
2131 2358
2132 { 2359 {
2133 int active = ((W)w)->active; 2360 int active = ((W)w)->active;
2201 ev_timer_set (&once->to, timeout, 0.); 2428 ev_timer_set (&once->to, timeout, 0.);
2202 ev_timer_start (EV_A_ &once->to); 2429 ev_timer_start (EV_A_ &once->to);
2203 } 2430 }
2204} 2431}
2205 2432
2433#if EV_MULTIPLICITY
2434 #include "ev_wrap.h"
2435#endif
2436
2206#ifdef __cplusplus 2437#ifdef __cplusplus
2207} 2438}
2208#endif 2439#endif
2209 2440

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines