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

Comparing libev/ev.c (file contents):
Revision 1.163 by root, Wed Dec 5 13:54:36 2007 UTC vs.
Revision 1.196 by root, Sat Dec 22 12:43:28 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
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
401int inline_size 460int inline_size
402array_nextsize (int elem, int cur, int cnt) 461array_nextsize (int elem, int cur, int cnt)
403{ 462{
404 int ncur = cur + 1; 463 int ncur = cur + 1;
405 464
417 } 476 }
418 477
419 return ncur; 478 return ncur;
420} 479}
421 480
422inline_speed void * 481static noinline void *
423array_realloc (int elem, void *base, int *cur, int cnt) 482array_realloc (int elem, void *base, int *cur, int cnt)
424{ 483{
425 *cur = array_nextsize (elem, *cur, cnt); 484 *cur = array_nextsize (elem, *cur, cnt);
426 return ev_realloc (base, elem * *cur); 485 return ev_realloc (base, elem * *cur);
427} 486}
452 511
453void noinline 512void noinline
454ev_feed_event (EV_P_ void *w, int revents) 513ev_feed_event (EV_P_ void *w, int revents)
455{ 514{
456 W w_ = (W)w; 515 W w_ = (W)w;
516 int pri = ABSPRI (w_);
457 517
458 if (expect_false (w_->pending)) 518 if (expect_false (w_->pending))
519 pendings [pri][w_->pending - 1].events |= revents;
520 else
459 { 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_;
460 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 525 pendings [pri][w_->pending - 1].events = revents;
461 return;
462 } 526 }
463
464 w_->pending = ++pendingcnt [ABSPRI (w_)];
465 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
466 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
467 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
468} 527}
469 528
470void inline_size 529void inline_speed
471queue_events (EV_P_ W *events, int eventcnt, int type) 530queue_events (EV_P_ W *events, int eventcnt, int type)
472{ 531{
473 int i; 532 int i;
474 533
475 for (i = 0; i < eventcnt; ++i) 534 for (i = 0; i < eventcnt; ++i)
507} 566}
508 567
509void 568void
510ev_feed_fd_event (EV_P_ int fd, int revents) 569ev_feed_fd_event (EV_P_ int fd, int revents)
511{ 570{
571 if (fd >= 0 && fd < anfdmax)
512 fd_event (EV_A_ fd, revents); 572 fd_event (EV_A_ fd, revents);
513} 573}
514 574
515void inline_size 575void inline_size
516fd_reify (EV_P) 576fd_reify (EV_P)
517{ 577{
521 { 581 {
522 int fd = fdchanges [i]; 582 int fd = fdchanges [i];
523 ANFD *anfd = anfds + fd; 583 ANFD *anfd = anfds + fd;
524 ev_io *w; 584 ev_io *w;
525 585
526 int events = 0; 586 unsigned char events = 0;
527 587
528 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)
529 events |= w->events; 589 events |= (unsigned char)w->events;
530 590
531#if EV_SELECT_IS_WINSOCKET 591#if EV_SELECT_IS_WINSOCKET
532 if (events) 592 if (events)
533 { 593 {
534 unsigned long argp; 594 unsigned long argp;
535 anfd->handle = _get_osfhandle (fd); 595 anfd->handle = _get_osfhandle (fd);
536 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));
537 } 597 }
538#endif 598#endif
539 599
600 {
601 unsigned char o_events = anfd->events;
602 unsigned char o_reify = anfd->reify;
603
540 anfd->reify = 0; 604 anfd->reify = 0;
541
542 backend_modify (EV_A_ fd, anfd->events, events);
543 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 }
544 } 610 }
545 611
546 fdchangecnt = 0; 612 fdchangecnt = 0;
547} 613}
548 614
549void inline_size 615void inline_size
550fd_change (EV_P_ int fd) 616fd_change (EV_P_ int fd, int flags)
551{ 617{
552 if (expect_false (anfds [fd].reify)) 618 unsigned char reify = anfds [fd].reify;
553 return;
554
555 anfds [fd].reify = 1; 619 anfds [fd].reify |= flags;
556 620
621 if (expect_true (!reify))
622 {
557 ++fdchangecnt; 623 ++fdchangecnt;
558 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 624 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
559 fdchanges [fdchangecnt - 1] = fd; 625 fdchanges [fdchangecnt - 1] = fd;
626 }
560} 627}
561 628
562void inline_speed 629void inline_speed
563fd_kill (EV_P_ int fd) 630fd_kill (EV_P_ int fd)
564{ 631{
615 682
616 for (fd = 0; fd < anfdmax; ++fd) 683 for (fd = 0; fd < anfdmax; ++fd)
617 if (anfds [fd].events) 684 if (anfds [fd].events)
618 { 685 {
619 anfds [fd].events = 0; 686 anfds [fd].events = 0;
620 fd_change (EV_A_ fd); 687 fd_change (EV_A_ fd, EV_IOFDSET | 1);
621 } 688 }
622} 689}
623 690
624/*****************************************************************************/ 691/*****************************************************************************/
625 692
626void inline_speed 693void inline_speed
627upheap (WT *heap, int k) 694upheap (WT *heap, int k)
628{ 695{
629 WT w = heap [k]; 696 WT w = heap [k];
630 697
631 while (k && heap [k >> 1]->at > w->at) 698 while (k)
632 { 699 {
700 int p = (k - 1) >> 1;
701
702 if (heap [p]->at <= w->at)
703 break;
704
633 heap [k] = heap [k >> 1]; 705 heap [k] = heap [p];
634 ((W)heap [k])->active = k + 1; 706 ((W)heap [k])->active = k + 1;
635 k >>= 1; 707 k = p;
636 } 708 }
637 709
638 heap [k] = w; 710 heap [k] = w;
639 ((W)heap [k])->active = k + 1; 711 ((W)heap [k])->active = k + 1;
640
641} 712}
642 713
643void inline_speed 714void inline_speed
644downheap (WT *heap, int N, int k) 715downheap (WT *heap, int N, int k)
645{ 716{
646 WT w = heap [k]; 717 WT w = heap [k];
647 718
648 while (k < (N >> 1)) 719 for (;;)
649 { 720 {
650 int j = k << 1; 721 int c = (k << 1) + 1;
651 722
652 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 723 if (c >= N)
653 ++j;
654
655 if (w->at <= heap [j]->at)
656 break; 724 break;
657 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
658 heap [k] = heap [j]; 732 heap [k] = heap [c];
659 ((W)heap [k])->active = k + 1; 733 ((W)heap [k])->active = k + 1;
734
660 k = j; 735 k = c;
661 } 736 }
662 737
663 heap [k] = w; 738 heap [k] = w;
664 ((W)heap [k])->active = k + 1; 739 ((W)heap [k])->active = k + 1;
665} 740}
747 for (signum = signalmax; signum--; ) 822 for (signum = signalmax; signum--; )
748 if (signals [signum].gotsig) 823 if (signals [signum].gotsig)
749 ev_feed_signal_event (EV_A_ signum + 1); 824 ev_feed_signal_event (EV_A_ signum + 1);
750} 825}
751 826
752void inline_size 827void inline_speed
753fd_intern (int fd) 828fd_intern (int fd)
754{ 829{
755#ifdef _WIN32 830#ifdef _WIN32
756 int arg = 1; 831 int arg = 1;
757 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 832 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
772 ev_unref (EV_A); /* child watcher should not keep loop alive */ 847 ev_unref (EV_A); /* child watcher should not keep loop alive */
773} 848}
774 849
775/*****************************************************************************/ 850/*****************************************************************************/
776 851
777static ev_child *childs [EV_PID_HASHSIZE]; 852static WL childs [EV_PID_HASHSIZE];
778 853
779#ifndef _WIN32 854#ifndef _WIN32
780 855
781static ev_signal childev; 856static ev_signal childev;
782 857
786 ev_child *w; 861 ev_child *w;
787 862
788 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)
789 if (w->pid == pid || !w->pid) 864 if (w->pid == pid || !w->pid)
790 { 865 {
791 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 866 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
792 w->rpid = pid; 867 w->rpid = pid;
793 w->rstatus = status; 868 w->rstatus = status;
794 ev_feed_event (EV_A_ (W)w, EV_CHILD); 869 ev_feed_event (EV_A_ (W)w, EV_CHILD);
795 } 870 }
796} 871}
797 872
798#ifndef WCONTINUED 873#ifndef WCONTINUED
897} 972}
898 973
899unsigned int 974unsigned int
900ev_embeddable_backends (void) 975ev_embeddable_backends (void)
901{ 976{
902 return EVBACKEND_EPOLL 977 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
903 | EVBACKEND_KQUEUE 978
904 | 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#ifdef __APPLE__
984 /* is there anything thats not broken on darwin? */
985 flags &= ~EVBACKEND_KQUEUE;
986#endif
987
988 return flags;
905} 989}
906 990
907unsigned int 991unsigned int
908ev_backend (EV_P) 992ev_backend (EV_P)
909{ 993{
912 996
913unsigned int 997unsigned int
914ev_loop_count (EV_P) 998ev_loop_count (EV_P)
915{ 999{
916 return loop_count; 1000 return loop_count;
1001}
1002
1003void
1004ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1005{
1006 io_blocktime = interval;
1007}
1008
1009void
1010ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1011{
1012 timeout_blocktime = interval;
917} 1013}
918 1014
919static void noinline 1015static void noinline
920loop_init (EV_P_ unsigned int flags) 1016loop_init (EV_P_ unsigned int flags)
921{ 1017{
932 ev_rt_now = ev_time (); 1028 ev_rt_now = ev_time ();
933 mn_now = get_clock (); 1029 mn_now = get_clock ();
934 now_floor = mn_now; 1030 now_floor = mn_now;
935 rtmn_diff = ev_rt_now - mn_now; 1031 rtmn_diff = ev_rt_now - mn_now;
936 1032
1033 io_blocktime = 0.;
1034 timeout_blocktime = 0.;
1035
937 /* pid check not overridable via env */ 1036 /* pid check not overridable via env */
938#ifndef _WIN32 1037#ifndef _WIN32
939 if (flags & EVFLAG_FORKCHECK) 1038 if (flags & EVFLAG_FORKCHECK)
940 curpid = getpid (); 1039 curpid = getpid ();
941#endif 1040#endif
1003#if EV_USE_SELECT 1102#if EV_USE_SELECT
1004 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1103 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
1005#endif 1104#endif
1006 1105
1007 for (i = NUMPRI; i--; ) 1106 for (i = NUMPRI; i--; )
1107 {
1008 array_free (pending, [i]); 1108 array_free (pending, [i]);
1109#if EV_IDLE_ENABLE
1110 array_free (idle, [i]);
1111#endif
1112 }
1113
1114 ev_free (anfds); anfdmax = 0;
1009 1115
1010 /* have to use the microsoft-never-gets-it-right macro */ 1116 /* have to use the microsoft-never-gets-it-right macro */
1011 array_free (fdchange, EMPTY0); 1117 array_free (fdchange, EMPTY);
1012 array_free (timer, EMPTY0); 1118 array_free (timer, EMPTY);
1013#if EV_PERIODIC_ENABLE 1119#if EV_PERIODIC_ENABLE
1014 array_free (periodic, EMPTY0); 1120 array_free (periodic, EMPTY);
1015#endif 1121#endif
1122#if EV_FORK_ENABLE
1016 array_free (idle, EMPTY0); 1123 array_free (fork, EMPTY);
1124#endif
1017 array_free (prepare, EMPTY0); 1125 array_free (prepare, EMPTY);
1018 array_free (check, EMPTY0); 1126 array_free (check, EMPTY);
1019 1127
1020 backend = 0; 1128 backend = 0;
1021} 1129}
1022 1130
1023void inline_size infy_fork (EV_P); 1131void inline_size infy_fork (EV_P);
1159 postfork = 1; 1267 postfork = 1;
1160} 1268}
1161 1269
1162/*****************************************************************************/ 1270/*****************************************************************************/
1163 1271
1164int inline_size 1272void
1165any_pending (EV_P) 1273ev_invoke (EV_P_ void *w, int revents)
1166{ 1274{
1167 int pri; 1275 EV_CB_INVOKE ((W)w, revents);
1168
1169 for (pri = NUMPRI; pri--; )
1170 if (pendingcnt [pri])
1171 return 1;
1172
1173 return 0;
1174} 1276}
1175 1277
1176void inline_speed 1278void inline_speed
1177call_pending (EV_P) 1279call_pending (EV_P)
1178{ 1280{
1196void inline_size 1298void inline_size
1197timers_reify (EV_P) 1299timers_reify (EV_P)
1198{ 1300{
1199 while (timercnt && ((WT)timers [0])->at <= mn_now) 1301 while (timercnt && ((WT)timers [0])->at <= mn_now)
1200 { 1302 {
1201 ev_timer *w = timers [0]; 1303 ev_timer *w = (ev_timer *)timers [0];
1202 1304
1203 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1305 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1204 1306
1205 /* first reschedule or stop timer */ 1307 /* first reschedule or stop timer */
1206 if (w->repeat) 1308 if (w->repeat)
1209 1311
1210 ((WT)w)->at += w->repeat; 1312 ((WT)w)->at += w->repeat;
1211 if (((WT)w)->at < mn_now) 1313 if (((WT)w)->at < mn_now)
1212 ((WT)w)->at = mn_now; 1314 ((WT)w)->at = mn_now;
1213 1315
1214 downheap ((WT *)timers, timercnt, 0); 1316 downheap (timers, timercnt, 0);
1215 } 1317 }
1216 else 1318 else
1217 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1319 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1218 1320
1219 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1321 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1224void inline_size 1326void inline_size
1225periodics_reify (EV_P) 1327periodics_reify (EV_P)
1226{ 1328{
1227 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1329 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1228 { 1330 {
1229 ev_periodic *w = periodics [0]; 1331 ev_periodic *w = (ev_periodic *)periodics [0];
1230 1332
1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1333 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1232 1334
1233 /* first reschedule or stop timer */ 1335 /* first reschedule or stop timer */
1234 if (w->reschedule_cb) 1336 if (w->reschedule_cb)
1235 { 1337 {
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1338 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1237 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1339 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1238 downheap ((WT *)periodics, periodiccnt, 0); 1340 downheap (periodics, periodiccnt, 0);
1239 } 1341 }
1240 else if (w->interval) 1342 else if (w->interval)
1241 { 1343 {
1242 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1344 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1345 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1243 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1346 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1244 downheap ((WT *)periodics, periodiccnt, 0); 1347 downheap (periodics, periodiccnt, 0);
1245 } 1348 }
1246 else 1349 else
1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1350 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1248 1351
1249 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1352 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1256 int i; 1359 int i;
1257 1360
1258 /* adjust periodics after time jump */ 1361 /* adjust periodics after time jump */
1259 for (i = 0; i < periodiccnt; ++i) 1362 for (i = 0; i < periodiccnt; ++i)
1260 { 1363 {
1261 ev_periodic *w = periodics [i]; 1364 ev_periodic *w = (ev_periodic *)periodics [i];
1262 1365
1263 if (w->reschedule_cb) 1366 if (w->reschedule_cb)
1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1367 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1265 else if (w->interval) 1368 else if (w->interval)
1266 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1369 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1267 } 1370 }
1268 1371
1269 /* now rebuild the heap */ 1372 /* now rebuild the heap */
1270 for (i = periodiccnt >> 1; i--; ) 1373 for (i = periodiccnt >> 1; i--; )
1271 downheap ((WT *)periodics, periodiccnt, i); 1374 downheap (periodics, periodiccnt, i);
1272} 1375}
1273#endif 1376#endif
1274 1377
1378#if EV_IDLE_ENABLE
1275int inline_size 1379void inline_size
1276time_update_monotonic (EV_P) 1380idle_reify (EV_P)
1277{ 1381{
1382 if (expect_false (idleall))
1383 {
1384 int pri;
1385
1386 for (pri = NUMPRI; pri--; )
1387 {
1388 if (pendingcnt [pri])
1389 break;
1390
1391 if (idlecnt [pri])
1392 {
1393 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1394 break;
1395 }
1396 }
1397 }
1398}
1399#endif
1400
1401void inline_speed
1402time_update (EV_P_ ev_tstamp max_block)
1403{
1404 int i;
1405
1406#if EV_USE_MONOTONIC
1407 if (expect_true (have_monotonic))
1408 {
1409 ev_tstamp odiff = rtmn_diff;
1410
1278 mn_now = get_clock (); 1411 mn_now = get_clock ();
1279 1412
1413 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1414 /* interpolate in the meantime */
1280 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1415 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1281 { 1416 {
1282 ev_rt_now = rtmn_diff + mn_now; 1417 ev_rt_now = rtmn_diff + mn_now;
1283 return 0; 1418 return;
1284 } 1419 }
1285 else 1420
1286 {
1287 now_floor = mn_now; 1421 now_floor = mn_now;
1288 ev_rt_now = ev_time (); 1422 ev_rt_now = ev_time ();
1289 return 1;
1290 }
1291}
1292 1423
1293void inline_size 1424 /* loop a few times, before making important decisions.
1294time_update (EV_P) 1425 * on the choice of "4": one iteration isn't enough,
1295{ 1426 * in case we get preempted during the calls to
1296 int i; 1427 * ev_time and get_clock. a second call is almost guaranteed
1297 1428 * to succeed in that case, though. and looping a few more times
1298#if EV_USE_MONOTONIC 1429 * doesn't hurt either as we only do this on time-jumps or
1299 if (expect_true (have_monotonic)) 1430 * in the unlikely event of having been preempted here.
1300 { 1431 */
1301 if (time_update_monotonic (EV_A)) 1432 for (i = 4; --i; )
1302 { 1433 {
1303 ev_tstamp odiff = rtmn_diff;
1304
1305 /* loop a few times, before making important decisions.
1306 * on the choice of "4": one iteration isn't enough,
1307 * in case we get preempted during the calls to
1308 * ev_time and get_clock. a second call is almost guaranteed
1309 * to succeed in that case, though. and looping a few more times
1310 * doesn't hurt either as we only do this on time-jumps or
1311 * in the unlikely event of having been preempted here.
1312 */
1313 for (i = 4; --i; )
1314 {
1315 rtmn_diff = ev_rt_now - mn_now; 1434 rtmn_diff = ev_rt_now - mn_now;
1316 1435
1317 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1436 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1318 return; /* all is well */ 1437 return; /* all is well */
1319 1438
1320 ev_rt_now = ev_time (); 1439 ev_rt_now = ev_time ();
1321 mn_now = get_clock (); 1440 mn_now = get_clock ();
1322 now_floor = mn_now; 1441 now_floor = mn_now;
1323 } 1442 }
1324 1443
1325# if EV_PERIODIC_ENABLE 1444# if EV_PERIODIC_ENABLE
1326 periodics_reschedule (EV_A); 1445 periodics_reschedule (EV_A);
1327# endif 1446# endif
1328 /* no timer adjustment, as the monotonic clock doesn't jump */ 1447 /* no timer adjustment, as the monotonic clock doesn't jump */
1329 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1448 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1330 }
1331 } 1449 }
1332 else 1450 else
1333#endif 1451#endif
1334 { 1452 {
1335 ev_rt_now = ev_time (); 1453 ev_rt_now = ev_time ();
1336 1454
1337 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1455 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1338 { 1456 {
1339#if EV_PERIODIC_ENABLE 1457#if EV_PERIODIC_ENABLE
1340 periodics_reschedule (EV_A); 1458 periodics_reschedule (EV_A);
1341#endif 1459#endif
1342
1343 /* adjust timers. this is easy, as the offset is the same for all of them */ 1460 /* adjust timers. this is easy, as the offset is the same for all of them */
1344 for (i = 0; i < timercnt; ++i) 1461 for (i = 0; i < timercnt; ++i)
1345 ((WT)timers [i])->at += ev_rt_now - mn_now; 1462 ((WT)timers [i])->at += ev_rt_now - mn_now;
1346 } 1463 }
1347 1464
1391 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1508 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1392 call_pending (EV_A); 1509 call_pending (EV_A);
1393 } 1510 }
1394#endif 1511#endif
1395 1512
1396 /* queue check watchers (and execute them) */ 1513 /* queue prepare watchers (and execute them) */
1397 if (expect_false (preparecnt)) 1514 if (expect_false (preparecnt))
1398 { 1515 {
1399 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1516 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1400 call_pending (EV_A); 1517 call_pending (EV_A);
1401 } 1518 }
1410 /* update fd-related kernel structures */ 1527 /* update fd-related kernel structures */
1411 fd_reify (EV_A); 1528 fd_reify (EV_A);
1412 1529
1413 /* calculate blocking time */ 1530 /* calculate blocking time */
1414 { 1531 {
1415 ev_tstamp block; 1532 ev_tstamp waittime = 0.;
1533 ev_tstamp sleeptime = 0.;
1416 1534
1417 if (expect_false (flags & EVLOOP_NONBLOCK || idlecnt || !activecnt)) 1535 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1418 block = 0.; /* do not block at all */
1419 else
1420 { 1536 {
1421 /* update time to cancel out callback processing overhead */ 1537 /* update time to cancel out callback processing overhead */
1422#if EV_USE_MONOTONIC
1423 if (expect_true (have_monotonic))
1424 time_update_monotonic (EV_A); 1538 time_update (EV_A_ 1e100);
1425 else
1426#endif
1427 {
1428 ev_rt_now = ev_time ();
1429 mn_now = ev_rt_now;
1430 }
1431 1539
1432 block = MAX_BLOCKTIME; 1540 waittime = MAX_BLOCKTIME;
1433 1541
1434 if (timercnt) 1542 if (timercnt)
1435 { 1543 {
1436 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1544 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1437 if (block > to) block = to; 1545 if (waittime > to) waittime = to;
1438 } 1546 }
1439 1547
1440#if EV_PERIODIC_ENABLE 1548#if EV_PERIODIC_ENABLE
1441 if (periodiccnt) 1549 if (periodiccnt)
1442 { 1550 {
1443 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1551 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1444 if (block > to) block = to; 1552 if (waittime > to) waittime = to;
1445 } 1553 }
1446#endif 1554#endif
1447 1555
1448 if (expect_false (block < 0.)) block = 0.; 1556 if (expect_false (waittime < timeout_blocktime))
1557 waittime = timeout_blocktime;
1558
1559 sleeptime = waittime - backend_fudge;
1560
1561 if (expect_true (sleeptime > io_blocktime))
1562 sleeptime = io_blocktime;
1563
1564 if (sleeptime)
1565 {
1566 ev_sleep (sleeptime);
1567 waittime -= sleeptime;
1568 }
1449 } 1569 }
1450 1570
1451 ++loop_count; 1571 ++loop_count;
1452 backend_poll (EV_A_ block); 1572 backend_poll (EV_A_ waittime);
1573
1574 /* update ev_rt_now, do magic */
1575 time_update (EV_A_ waittime + sleeptime);
1453 } 1576 }
1454
1455 /* update ev_rt_now, do magic */
1456 time_update (EV_A);
1457 1577
1458 /* queue pending timers and reschedule them */ 1578 /* queue pending timers and reschedule them */
1459 timers_reify (EV_A); /* relative timers called last */ 1579 timers_reify (EV_A); /* relative timers called last */
1460#if EV_PERIODIC_ENABLE 1580#if EV_PERIODIC_ENABLE
1461 periodics_reify (EV_A); /* absolute timers called first */ 1581 periodics_reify (EV_A); /* absolute timers called first */
1462#endif 1582#endif
1463 1583
1584#if EV_IDLE_ENABLE
1464 /* queue idle watchers unless other events are pending */ 1585 /* queue idle watchers unless other events are pending */
1465 if (idlecnt && !any_pending (EV_A)) 1586 idle_reify (EV_A);
1466 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1587#endif
1467 1588
1468 /* queue check watchers, to be executed first */ 1589 /* queue check watchers, to be executed first */
1469 if (expect_false (checkcnt)) 1590 if (expect_false (checkcnt))
1470 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1591 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1471 1592
1507 head = &(*head)->next; 1628 head = &(*head)->next;
1508 } 1629 }
1509} 1630}
1510 1631
1511void inline_speed 1632void inline_speed
1512ev_clear_pending (EV_P_ W w) 1633clear_pending (EV_P_ W w)
1513{ 1634{
1514 if (w->pending) 1635 if (w->pending)
1515 { 1636 {
1516 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1637 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1517 w->pending = 0; 1638 w->pending = 0;
1518 } 1639 }
1519} 1640}
1520 1641
1642int
1643ev_clear_pending (EV_P_ void *w)
1644{
1645 W w_ = (W)w;
1646 int pending = w_->pending;
1647
1648 if (expect_true (pending))
1649 {
1650 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1651 w_->pending = 0;
1652 p->w = 0;
1653 return p->events;
1654 }
1655 else
1656 return 0;
1657}
1658
1659void inline_size
1660pri_adjust (EV_P_ W w)
1661{
1662 int pri = w->priority;
1663 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1664 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1665 w->priority = pri;
1666}
1667
1521void inline_speed 1668void inline_speed
1522ev_start (EV_P_ W w, int active) 1669ev_start (EV_P_ W w, int active)
1523{ 1670{
1524 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1671 pri_adjust (EV_A_ w);
1525 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1526
1527 w->active = active; 1672 w->active = active;
1528 ev_ref (EV_A); 1673 ev_ref (EV_A);
1529} 1674}
1530 1675
1531void inline_size 1676void inline_size
1535 w->active = 0; 1680 w->active = 0;
1536} 1681}
1537 1682
1538/*****************************************************************************/ 1683/*****************************************************************************/
1539 1684
1540void 1685void noinline
1541ev_io_start (EV_P_ ev_io *w) 1686ev_io_start (EV_P_ ev_io *w)
1542{ 1687{
1543 int fd = w->fd; 1688 int fd = w->fd;
1544 1689
1545 if (expect_false (ev_is_active (w))) 1690 if (expect_false (ev_is_active (w)))
1547 1692
1548 assert (("ev_io_start called with negative fd", fd >= 0)); 1693 assert (("ev_io_start called with negative fd", fd >= 0));
1549 1694
1550 ev_start (EV_A_ (W)w, 1); 1695 ev_start (EV_A_ (W)w, 1);
1551 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1696 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1552 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1697 wlist_add (&anfds[fd].head, (WL)w);
1553 1698
1554 fd_change (EV_A_ fd); 1699 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1700 w->events &= ~EV_IOFDSET;
1555} 1701}
1556 1702
1557void 1703void noinline
1558ev_io_stop (EV_P_ ev_io *w) 1704ev_io_stop (EV_P_ ev_io *w)
1559{ 1705{
1560 ev_clear_pending (EV_A_ (W)w); 1706 clear_pending (EV_A_ (W)w);
1561 if (expect_false (!ev_is_active (w))) 1707 if (expect_false (!ev_is_active (w)))
1562 return; 1708 return;
1563 1709
1564 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1710 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1565 1711
1566 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1712 wlist_del (&anfds[w->fd].head, (WL)w);
1567 ev_stop (EV_A_ (W)w); 1713 ev_stop (EV_A_ (W)w);
1568 1714
1569 fd_change (EV_A_ w->fd); 1715 fd_change (EV_A_ w->fd, 1);
1570} 1716}
1571 1717
1572void 1718void noinline
1573ev_timer_start (EV_P_ ev_timer *w) 1719ev_timer_start (EV_P_ ev_timer *w)
1574{ 1720{
1575 if (expect_false (ev_is_active (w))) 1721 if (expect_false (ev_is_active (w)))
1576 return; 1722 return;
1577 1723
1578 ((WT)w)->at += mn_now; 1724 ((WT)w)->at += mn_now;
1579 1725
1580 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1726 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1581 1727
1582 ev_start (EV_A_ (W)w, ++timercnt); 1728 ev_start (EV_A_ (W)w, ++timercnt);
1583 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1729 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1584 timers [timercnt - 1] = w; 1730 timers [timercnt - 1] = (WT)w;
1585 upheap ((WT *)timers, timercnt - 1); 1731 upheap (timers, timercnt - 1);
1586 1732
1587 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1733 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1588} 1734}
1589 1735
1590void 1736void noinline
1591ev_timer_stop (EV_P_ ev_timer *w) 1737ev_timer_stop (EV_P_ ev_timer *w)
1592{ 1738{
1593 ev_clear_pending (EV_A_ (W)w); 1739 clear_pending (EV_A_ (W)w);
1594 if (expect_false (!ev_is_active (w))) 1740 if (expect_false (!ev_is_active (w)))
1595 return; 1741 return;
1596 1742
1597 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1743 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1598 1744
1599 { 1745 {
1600 int active = ((W)w)->active; 1746 int active = ((W)w)->active;
1601 1747
1602 if (expect_true (--active < --timercnt)) 1748 if (expect_true (--active < --timercnt))
1603 { 1749 {
1604 timers [active] = timers [timercnt]; 1750 timers [active] = timers [timercnt];
1605 adjustheap ((WT *)timers, timercnt, active); 1751 adjustheap (timers, timercnt, active);
1606 } 1752 }
1607 } 1753 }
1608 1754
1609 ((WT)w)->at -= mn_now; 1755 ((WT)w)->at -= mn_now;
1610 1756
1611 ev_stop (EV_A_ (W)w); 1757 ev_stop (EV_A_ (W)w);
1612} 1758}
1613 1759
1614void 1760void noinline
1615ev_timer_again (EV_P_ ev_timer *w) 1761ev_timer_again (EV_P_ ev_timer *w)
1616{ 1762{
1617 if (ev_is_active (w)) 1763 if (ev_is_active (w))
1618 { 1764 {
1619 if (w->repeat) 1765 if (w->repeat)
1620 { 1766 {
1621 ((WT)w)->at = mn_now + w->repeat; 1767 ((WT)w)->at = mn_now + w->repeat;
1622 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1768 adjustheap (timers, timercnt, ((W)w)->active - 1);
1623 } 1769 }
1624 else 1770 else
1625 ev_timer_stop (EV_A_ w); 1771 ev_timer_stop (EV_A_ w);
1626 } 1772 }
1627 else if (w->repeat) 1773 else if (w->repeat)
1630 ev_timer_start (EV_A_ w); 1776 ev_timer_start (EV_A_ w);
1631 } 1777 }
1632} 1778}
1633 1779
1634#if EV_PERIODIC_ENABLE 1780#if EV_PERIODIC_ENABLE
1635void 1781void noinline
1636ev_periodic_start (EV_P_ ev_periodic *w) 1782ev_periodic_start (EV_P_ ev_periodic *w)
1637{ 1783{
1638 if (expect_false (ev_is_active (w))) 1784 if (expect_false (ev_is_active (w)))
1639 return; 1785 return;
1640 1786
1642 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1788 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1643 else if (w->interval) 1789 else if (w->interval)
1644 { 1790 {
1645 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1791 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1646 /* this formula differs from the one in periodic_reify because we do not always round up */ 1792 /* this formula differs from the one in periodic_reify because we do not always round up */
1647 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1793 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1648 } 1794 }
1795 else
1796 ((WT)w)->at = w->offset;
1649 1797
1650 ev_start (EV_A_ (W)w, ++periodiccnt); 1798 ev_start (EV_A_ (W)w, ++periodiccnt);
1651 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1799 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1652 periodics [periodiccnt - 1] = w; 1800 periodics [periodiccnt - 1] = (WT)w;
1653 upheap ((WT *)periodics, periodiccnt - 1); 1801 upheap (periodics, periodiccnt - 1);
1654 1802
1655 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1803 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1656} 1804}
1657 1805
1658void 1806void noinline
1659ev_periodic_stop (EV_P_ ev_periodic *w) 1807ev_periodic_stop (EV_P_ ev_periodic *w)
1660{ 1808{
1661 ev_clear_pending (EV_A_ (W)w); 1809 clear_pending (EV_A_ (W)w);
1662 if (expect_false (!ev_is_active (w))) 1810 if (expect_false (!ev_is_active (w)))
1663 return; 1811 return;
1664 1812
1665 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1813 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1666 1814
1667 { 1815 {
1668 int active = ((W)w)->active; 1816 int active = ((W)w)->active;
1669 1817
1670 if (expect_true (--active < --periodiccnt)) 1818 if (expect_true (--active < --periodiccnt))
1671 { 1819 {
1672 periodics [active] = periodics [periodiccnt]; 1820 periodics [active] = periodics [periodiccnt];
1673 adjustheap ((WT *)periodics, periodiccnt, active); 1821 adjustheap (periodics, periodiccnt, active);
1674 } 1822 }
1675 } 1823 }
1676 1824
1677 ev_stop (EV_A_ (W)w); 1825 ev_stop (EV_A_ (W)w);
1678} 1826}
1679 1827
1680void 1828void noinline
1681ev_periodic_again (EV_P_ ev_periodic *w) 1829ev_periodic_again (EV_P_ ev_periodic *w)
1682{ 1830{
1683 /* TODO: use adjustheap and recalculation */ 1831 /* TODO: use adjustheap and recalculation */
1684 ev_periodic_stop (EV_A_ w); 1832 ev_periodic_stop (EV_A_ w);
1685 ev_periodic_start (EV_A_ w); 1833 ev_periodic_start (EV_A_ w);
1688 1836
1689#ifndef SA_RESTART 1837#ifndef SA_RESTART
1690# define SA_RESTART 0 1838# define SA_RESTART 0
1691#endif 1839#endif
1692 1840
1693void 1841void noinline
1694ev_signal_start (EV_P_ ev_signal *w) 1842ev_signal_start (EV_P_ ev_signal *w)
1695{ 1843{
1696#if EV_MULTIPLICITY 1844#if EV_MULTIPLICITY
1697 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1845 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1698#endif 1846#endif
1699 if (expect_false (ev_is_active (w))) 1847 if (expect_false (ev_is_active (w)))
1700 return; 1848 return;
1701 1849
1702 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1850 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1703 1851
1852 {
1853#ifndef _WIN32
1854 sigset_t full, prev;
1855 sigfillset (&full);
1856 sigprocmask (SIG_SETMASK, &full, &prev);
1857#endif
1858
1859 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1860
1861#ifndef _WIN32
1862 sigprocmask (SIG_SETMASK, &prev, 0);
1863#endif
1864 }
1865
1704 ev_start (EV_A_ (W)w, 1); 1866 ev_start (EV_A_ (W)w, 1);
1705 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1706 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1867 wlist_add (&signals [w->signum - 1].head, (WL)w);
1707 1868
1708 if (!((WL)w)->next) 1869 if (!((WL)w)->next)
1709 { 1870 {
1710#if _WIN32 1871#if _WIN32
1711 signal (w->signum, sighandler); 1872 signal (w->signum, sighandler);
1717 sigaction (w->signum, &sa, 0); 1878 sigaction (w->signum, &sa, 0);
1718#endif 1879#endif
1719 } 1880 }
1720} 1881}
1721 1882
1722void 1883void noinline
1723ev_signal_stop (EV_P_ ev_signal *w) 1884ev_signal_stop (EV_P_ ev_signal *w)
1724{ 1885{
1725 ev_clear_pending (EV_A_ (W)w); 1886 clear_pending (EV_A_ (W)w);
1726 if (expect_false (!ev_is_active (w))) 1887 if (expect_false (!ev_is_active (w)))
1727 return; 1888 return;
1728 1889
1729 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1890 wlist_del (&signals [w->signum - 1].head, (WL)w);
1730 ev_stop (EV_A_ (W)w); 1891 ev_stop (EV_A_ (W)w);
1731 1892
1732 if (!signals [w->signum - 1].head) 1893 if (!signals [w->signum - 1].head)
1733 signal (w->signum, SIG_DFL); 1894 signal (w->signum, SIG_DFL);
1734} 1895}
1741#endif 1902#endif
1742 if (expect_false (ev_is_active (w))) 1903 if (expect_false (ev_is_active (w)))
1743 return; 1904 return;
1744 1905
1745 ev_start (EV_A_ (W)w, 1); 1906 ev_start (EV_A_ (W)w, 1);
1746 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1907 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1747} 1908}
1748 1909
1749void 1910void
1750ev_child_stop (EV_P_ ev_child *w) 1911ev_child_stop (EV_P_ ev_child *w)
1751{ 1912{
1752 ev_clear_pending (EV_A_ (W)w); 1913 clear_pending (EV_A_ (W)w);
1753 if (expect_false (!ev_is_active (w))) 1914 if (expect_false (!ev_is_active (w)))
1754 return; 1915 return;
1755 1916
1756 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1917 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1757 ev_stop (EV_A_ (W)w); 1918 ev_stop (EV_A_ (W)w);
1758} 1919}
1759 1920
1760#if EV_STAT_ENABLE 1921#if EV_STAT_ENABLE
1761 1922
1993} 2154}
1994 2155
1995void 2156void
1996ev_stat_stop (EV_P_ ev_stat *w) 2157ev_stat_stop (EV_P_ ev_stat *w)
1997{ 2158{
1998 ev_clear_pending (EV_A_ (W)w); 2159 clear_pending (EV_A_ (W)w);
1999 if (expect_false (!ev_is_active (w))) 2160 if (expect_false (!ev_is_active (w)))
2000 return; 2161 return;
2001 2162
2002#if EV_USE_INOTIFY 2163#if EV_USE_INOTIFY
2003 infy_del (EV_A_ w); 2164 infy_del (EV_A_ w);
2006 2167
2007 ev_stop (EV_A_ (W)w); 2168 ev_stop (EV_A_ (W)w);
2008} 2169}
2009#endif 2170#endif
2010 2171
2172#if EV_IDLE_ENABLE
2011void 2173void
2012ev_idle_start (EV_P_ ev_idle *w) 2174ev_idle_start (EV_P_ ev_idle *w)
2013{ 2175{
2014 if (expect_false (ev_is_active (w))) 2176 if (expect_false (ev_is_active (w)))
2015 return; 2177 return;
2016 2178
2179 pri_adjust (EV_A_ (W)w);
2180
2181 {
2182 int active = ++idlecnt [ABSPRI (w)];
2183
2184 ++idleall;
2017 ev_start (EV_A_ (W)w, ++idlecnt); 2185 ev_start (EV_A_ (W)w, active);
2186
2018 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2187 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2019 idles [idlecnt - 1] = w; 2188 idles [ABSPRI (w)][active - 1] = w;
2189 }
2020} 2190}
2021 2191
2022void 2192void
2023ev_idle_stop (EV_P_ ev_idle *w) 2193ev_idle_stop (EV_P_ ev_idle *w)
2024{ 2194{
2025 ev_clear_pending (EV_A_ (W)w); 2195 clear_pending (EV_A_ (W)w);
2026 if (expect_false (!ev_is_active (w))) 2196 if (expect_false (!ev_is_active (w)))
2027 return; 2197 return;
2028 2198
2029 { 2199 {
2030 int active = ((W)w)->active; 2200 int active = ((W)w)->active;
2031 idles [active - 1] = idles [--idlecnt]; 2201
2202 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2032 ((W)idles [active - 1])->active = active; 2203 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2204
2205 ev_stop (EV_A_ (W)w);
2206 --idleall;
2033 } 2207 }
2034
2035 ev_stop (EV_A_ (W)w);
2036} 2208}
2209#endif
2037 2210
2038void 2211void
2039ev_prepare_start (EV_P_ ev_prepare *w) 2212ev_prepare_start (EV_P_ ev_prepare *w)
2040{ 2213{
2041 if (expect_false (ev_is_active (w))) 2214 if (expect_false (ev_is_active (w)))
2047} 2220}
2048 2221
2049void 2222void
2050ev_prepare_stop (EV_P_ ev_prepare *w) 2223ev_prepare_stop (EV_P_ ev_prepare *w)
2051{ 2224{
2052 ev_clear_pending (EV_A_ (W)w); 2225 clear_pending (EV_A_ (W)w);
2053 if (expect_false (!ev_is_active (w))) 2226 if (expect_false (!ev_is_active (w)))
2054 return; 2227 return;
2055 2228
2056 { 2229 {
2057 int active = ((W)w)->active; 2230 int active = ((W)w)->active;
2074} 2247}
2075 2248
2076void 2249void
2077ev_check_stop (EV_P_ ev_check *w) 2250ev_check_stop (EV_P_ ev_check *w)
2078{ 2251{
2079 ev_clear_pending (EV_A_ (W)w); 2252 clear_pending (EV_A_ (W)w);
2080 if (expect_false (!ev_is_active (w))) 2253 if (expect_false (!ev_is_active (w)))
2081 return; 2254 return;
2082 2255
2083 { 2256 {
2084 int active = ((W)w)->active; 2257 int active = ((W)w)->active;
2091 2264
2092#if EV_EMBED_ENABLE 2265#if EV_EMBED_ENABLE
2093void noinline 2266void noinline
2094ev_embed_sweep (EV_P_ ev_embed *w) 2267ev_embed_sweep (EV_P_ ev_embed *w)
2095{ 2268{
2096 ev_loop (w->loop, EVLOOP_NONBLOCK); 2269 ev_loop (w->other, EVLOOP_NONBLOCK);
2097} 2270}
2098 2271
2099static void 2272static void
2100embed_cb (EV_P_ ev_io *io, int revents) 2273embed_io_cb (EV_P_ ev_io *io, int revents)
2101{ 2274{
2102 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2275 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2103 2276
2104 if (ev_cb (w)) 2277 if (ev_cb (w))
2105 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2278 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2106 else 2279 else
2107 ev_embed_sweep (loop, w); 2280 ev_loop (w->other, EVLOOP_NONBLOCK);
2108} 2281}
2282
2283static void
2284embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2285{
2286 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2287
2288 {
2289 struct ev_loop *loop = w->other;
2290
2291 while (fdchangecnt)
2292 {
2293 fd_reify (EV_A);
2294 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2295 }
2296 }
2297}
2298
2299#if 0
2300static void
2301embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2302{
2303 ev_idle_stop (EV_A_ idle);
2304}
2305#endif
2109 2306
2110void 2307void
2111ev_embed_start (EV_P_ ev_embed *w) 2308ev_embed_start (EV_P_ ev_embed *w)
2112{ 2309{
2113 if (expect_false (ev_is_active (w))) 2310 if (expect_false (ev_is_active (w)))
2114 return; 2311 return;
2115 2312
2116 { 2313 {
2117 struct ev_loop *loop = w->loop; 2314 struct ev_loop *loop = w->other;
2118 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2315 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2119 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2316 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2120 } 2317 }
2121 2318
2122 ev_set_priority (&w->io, ev_priority (w)); 2319 ev_set_priority (&w->io, ev_priority (w));
2123 ev_io_start (EV_A_ &w->io); 2320 ev_io_start (EV_A_ &w->io);
2124 2321
2322 ev_prepare_init (&w->prepare, embed_prepare_cb);
2323 ev_set_priority (&w->prepare, EV_MINPRI);
2324 ev_prepare_start (EV_A_ &w->prepare);
2325
2326 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2327
2125 ev_start (EV_A_ (W)w, 1); 2328 ev_start (EV_A_ (W)w, 1);
2126} 2329}
2127 2330
2128void 2331void
2129ev_embed_stop (EV_P_ ev_embed *w) 2332ev_embed_stop (EV_P_ ev_embed *w)
2130{ 2333{
2131 ev_clear_pending (EV_A_ (W)w); 2334 clear_pending (EV_A_ (W)w);
2132 if (expect_false (!ev_is_active (w))) 2335 if (expect_false (!ev_is_active (w)))
2133 return; 2336 return;
2134 2337
2135 ev_io_stop (EV_A_ &w->io); 2338 ev_io_stop (EV_A_ &w->io);
2339 ev_prepare_stop (EV_A_ &w->prepare);
2136 2340
2137 ev_stop (EV_A_ (W)w); 2341 ev_stop (EV_A_ (W)w);
2138} 2342}
2139#endif 2343#endif
2140 2344
2151} 2355}
2152 2356
2153void 2357void
2154ev_fork_stop (EV_P_ ev_fork *w) 2358ev_fork_stop (EV_P_ ev_fork *w)
2155{ 2359{
2156 ev_clear_pending (EV_A_ (W)w); 2360 clear_pending (EV_A_ (W)w);
2157 if (expect_false (!ev_is_active (w))) 2361 if (expect_false (!ev_is_active (w)))
2158 return; 2362 return;
2159 2363
2160 { 2364 {
2161 int active = ((W)w)->active; 2365 int active = ((W)w)->active;
2229 ev_timer_set (&once->to, timeout, 0.); 2433 ev_timer_set (&once->to, timeout, 0.);
2230 ev_timer_start (EV_A_ &once->to); 2434 ev_timer_start (EV_A_ &once->to);
2231 } 2435 }
2232} 2436}
2233 2437
2438#if EV_MULTIPLICITY
2439 #include "ev_wrap.h"
2440#endif
2441
2234#ifdef __cplusplus 2442#ifdef __cplusplus
2235} 2443}
2236#endif 2444#endif
2237 2445

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines