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

Comparing libev/ev.c (file contents):
Revision 1.74 by root, Tue Nov 6 16:51:20 2007 UTC vs.
Revision 1.89 by root, Sat Nov 10 19:48:44 2007 UTC

… …
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
32# include "config.h" 37# include "config.h"
33 38
34# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
35# define EV_USE_MONOTONIC 1 40# define EV_USE_MONOTONIC 1
… …
46 51
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 52# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1 53# define EV_USE_EPOLL 1
49# endif 54# endif
50 55
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 56# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1 57# define EV_USE_KQUEUE 1
53# endif 58# endif
54 59
55#endif 60#endif
56 61
… …
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 131#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
127#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 132#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
128#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 133#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
129/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 134/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
130 135
136#ifdef EV_H
137# include EV_H
138#else
131#include "ev.h" 139# include "ev.h"
140#endif
132 141
133#if __GNUC__ >= 3 142#if __GNUC__ >= 3
134# define expect(expr,value) __builtin_expect ((expr),(value)) 143# define expect(expr,value) __builtin_expect ((expr),(value))
135# define inline inline 144# define inline inline
136#else 145#else
… …
215 int events; 224 int events;
216} ANPENDING; 225} ANPENDING;
217 226
218#if EV_MULTIPLICITY 227#if EV_MULTIPLICITY
219 228
220struct ev_loop 229 struct ev_loop
221{ 230 {
231 ev_tstamp ev_rt_now;
222# define VAR(name,decl) decl; 232 #define VAR(name,decl) decl;
223# include "ev_vars.h" 233 #include "ev_vars.h"
224};
225# undef VAR 234 #undef VAR
235 };
226# include "ev_wrap.h" 236 #include "ev_wrap.h"
237
238 struct ev_loop default_loop_struct;
239 static struct ev_loop *default_loop;
227 240
228#else 241#else
229 242
243 ev_tstamp ev_rt_now;
230# define VAR(name,decl) static decl; 244 #define VAR(name,decl) static decl;
231# include "ev_vars.h" 245 #include "ev_vars.h"
232# undef VAR 246 #undef VAR
247
248 static int default_loop;
233 249
234#endif 250#endif
235 251
236/*****************************************************************************/ 252/*****************************************************************************/
237 253
… …
262#endif 278#endif
263 279
264 return ev_time (); 280 return ev_time ();
265} 281}
266 282
283#if EV_MULTIPLICITY
267ev_tstamp 284ev_tstamp
268ev_now (EV_P) 285ev_now (EV_P)
269{ 286{
270 return rt_now; 287 return ev_rt_now;
271} 288}
289#endif
272 290
273#define array_roundsize(type,n) ((n) | 4 & ~3) 291#define array_roundsize(type,n) ((n) | 4 & ~3)
274 292
275#define array_needsize(type,base,cur,cnt,init) \ 293#define array_needsize(type,base,cur,cnt,init) \
276 if (expect_false ((cnt) > cur)) \ 294 if (expect_false ((cnt) > cur)) \
… …
316 334
317 ++base; 335 ++base;
318 } 336 }
319} 337}
320 338
321static void 339void
322event (EV_P_ W w, int events) 340ev_feed_event (EV_P_ void *w, int revents)
323{ 341{
342 W w_ = (W)w;
343
324 if (w->pending) 344 if (w_->pending)
325 { 345 {
326 pendings [ABSPRI (w)][w->pending - 1].events |= events; 346 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
327 return; 347 return;
328 } 348 }
329 349
330 w->pending = ++pendingcnt [ABSPRI (w)]; 350 w_->pending = ++pendingcnt [ABSPRI (w_)];
331 array_needsize (ANPENDING, pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], (void)); 351 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
332 pendings [ABSPRI (w)][w->pending - 1].w = w; 352 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
333 pendings [ABSPRI (w)][w->pending - 1].events = events; 353 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
334} 354}
335 355
336static void 356static void
337queue_events (EV_P_ W *events, int eventcnt, int type) 357queue_events (EV_P_ W *events, int eventcnt, int type)
338{ 358{
339 int i; 359 int i;
340 360
341 for (i = 0; i < eventcnt; ++i) 361 for (i = 0; i < eventcnt; ++i)
342 event (EV_A_ events [i], type); 362 ev_feed_event (EV_A_ events [i], type);
343} 363}
344 364
345static void 365inline void
346fd_event (EV_P_ int fd, int events) 366fd_event (EV_P_ int fd, int revents)
347{ 367{
348 ANFD *anfd = anfds + fd; 368 ANFD *anfd = anfds + fd;
349 struct ev_io *w; 369 struct ev_io *w;
350 370
351 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 371 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
352 { 372 {
353 int ev = w->events & events; 373 int ev = w->events & revents;
354 374
355 if (ev) 375 if (ev)
356 event (EV_A_ (W)w, ev); 376 ev_feed_event (EV_A_ (W)w, ev);
357 } 377 }
378}
379
380void
381ev_feed_fd_event (EV_P_ int fd, int revents)
382{
383 fd_event (EV_A_ fd, revents);
358} 384}
359 385
360/*****************************************************************************/ 386/*****************************************************************************/
361 387
362static void 388static void
… …
403 struct ev_io *w; 429 struct ev_io *w;
404 430
405 while ((w = (struct ev_io *)anfds [fd].head)) 431 while ((w = (struct ev_io *)anfds [fd].head))
406 { 432 {
407 ev_io_stop (EV_A_ w); 433 ev_io_stop (EV_A_ w);
408 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 434 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
409 } 435 }
410} 436}
411 437
412static int 438static int
413fd_valid (int fd) 439fd_valid (int fd)
… …
501 527
502 heap [k] = w; 528 heap [k] = w;
503 ((W)heap [k])->active = k + 1; 529 ((W)heap [k])->active = k + 1;
504} 530}
505 531
532inline void
533adjustheap (WT *heap, int N, int k, ev_tstamp at)
534{
535 ev_tstamp old_at = heap [k]->at;
536 heap [k]->at = at;
537
538 if (old_at < at)
539 downheap (heap, N, k);
540 else
541 upheap (heap, k);
542}
543
506/*****************************************************************************/ 544/*****************************************************************************/
507 545
508typedef struct 546typedef struct
509{ 547{
510 WL head; 548 WL head;
… …
541 579
542 if (!gotsig) 580 if (!gotsig)
543 { 581 {
544 int old_errno = errno; 582 int old_errno = errno;
545 gotsig = 1; 583 gotsig = 1;
584#ifdef WIN32
585 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
586#else
546 write (sigpipe [1], &signum, 1); 587 write (sigpipe [1], &signum, 1);
588#endif
547 errno = old_errno; 589 errno = old_errno;
548 } 590 }
549} 591}
550 592
593void
594ev_feed_signal_event (EV_P_ int signum)
595{
596 WL w;
597
598#if EV_MULTIPLICITY
599 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
600#endif
601
602 --signum;
603
604 if (signum < 0 || signum >= signalmax)
605 return;
606
607 signals [signum].gotsig = 0;
608
609 for (w = signals [signum].head; w; w = w->next)
610 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
611}
612
551static void 613static void
552sigcb (EV_P_ struct ev_io *iow, int revents) 614sigcb (EV_P_ struct ev_io *iow, int revents)
553{ 615{
554 WL w;
555 int signum; 616 int signum;
556 617
618#ifdef WIN32
619 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
620#else
557 read (sigpipe [0], &revents, 1); 621 read (sigpipe [0], &revents, 1);
622#endif
558 gotsig = 0; 623 gotsig = 0;
559 624
560 for (signum = signalmax; signum--; ) 625 for (signum = signalmax; signum--; )
561 if (signals [signum].gotsig) 626 if (signals [signum].gotsig)
562 { 627 ev_feed_signal_event (EV_A_ signum + 1);
563 signals [signum].gotsig = 0;
564
565 for (w = signals [signum].head; w; w = w->next)
566 event (EV_A_ (W)w, EV_SIGNAL);
567 }
568} 628}
569 629
570static void 630static void
571siginit (EV_P) 631siginit (EV_P)
572{ 632{
… …
605 if (w->pid == pid || !w->pid) 665 if (w->pid == pid || !w->pid)
606 { 666 {
607 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 667 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
608 w->rpid = pid; 668 w->rpid = pid;
609 w->rstatus = status; 669 w->rstatus = status;
610 event (EV_A_ (W)w, EV_CHILD); 670 ev_feed_event (EV_A_ (W)w, EV_CHILD);
611 } 671 }
612} 672}
613 673
614static void 674static void
615childcb (EV_P_ struct ev_signal *sw, int revents) 675childcb (EV_P_ struct ev_signal *sw, int revents)
… …
617 int pid, status; 677 int pid, status;
618 678
619 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 679 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
620 { 680 {
621 /* make sure we are called again until all childs have been reaped */ 681 /* make sure we are called again until all childs have been reaped */
622 event (EV_A_ (W)sw, EV_SIGNAL); 682 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
623 683
624 child_reap (EV_A_ sw, pid, pid, status); 684 child_reap (EV_A_ sw, pid, pid, status);
625 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 685 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
626 } 686 }
627} 687}
… …
684 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 744 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
685 have_monotonic = 1; 745 have_monotonic = 1;
686 } 746 }
687#endif 747#endif
688 748
689 rt_now = ev_time (); 749 ev_rt_now = ev_time ();
690 mn_now = get_clock (); 750 mn_now = get_clock ();
691 now_floor = mn_now; 751 now_floor = mn_now;
692 rtmn_diff = rt_now - mn_now; 752 rtmn_diff = ev_rt_now - mn_now;
693 753
694 if (methods == EVMETHOD_AUTO) 754 if (methods == EVMETHOD_AUTO)
695 if (!enable_secure () && getenv ("LIBEV_METHODS")) 755 if (!enable_secure () && getenv ("LIBEV_METHODS"))
696 methods = atoi (getenv ("LIBEV_METHODS")); 756 methods = atoi (getenv ("LIBEV_METHODS"));
697 else 757 else
… …
712#endif 772#endif
713#if EV_USE_SELECT 773#if EV_USE_SELECT
714 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 774 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
715#endif 775#endif
716 776
717 ev_watcher_init (&sigev, sigcb); 777 ev_init (&sigev, sigcb);
718 ev_set_priority (&sigev, EV_MAXPRI); 778 ev_set_priority (&sigev, EV_MAXPRI);
719 } 779 }
720} 780}
721 781
722void 782void
… …
812} 872}
813 873
814#endif 874#endif
815 875
816#if EV_MULTIPLICITY 876#if EV_MULTIPLICITY
817struct ev_loop default_loop_struct;
818static struct ev_loop *default_loop;
819
820struct ev_loop * 877struct ev_loop *
821#else 878#else
822static int default_loop;
823
824int 879int
825#endif 880#endif
826ev_default_loop (int methods) 881ev_default_loop (int methods)
827{ 882{
828 if (sigpipe [0] == sigpipe [1]) 883 if (sigpipe [0] == sigpipe [1])
… …
889 postfork = 1; 944 postfork = 1;
890} 945}
891 946
892/*****************************************************************************/ 947/*****************************************************************************/
893 948
949static int
950any_pending (EV_P)
951{
952 int pri;
953
954 for (pri = NUMPRI; pri--; )
955 if (pendingcnt [pri])
956 return 1;
957
958 return 0;
959}
960
894static void 961static void
895call_pending (EV_P) 962call_pending (EV_P)
896{ 963{
897 int pri; 964 int pri;
898 965
… …
902 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 969 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
903 970
904 if (p->w) 971 if (p->w)
905 { 972 {
906 p->w->pending = 0; 973 p->w->pending = 0;
907 p->w->cb (EV_A_ p->w, p->events); 974 EV_CB_INVOKE (p->w, p->events);
908 } 975 }
909 } 976 }
910} 977}
911 978
912static void 979static void
… …
926 downheap ((WT *)timers, timercnt, 0); 993 downheap ((WT *)timers, timercnt, 0);
927 } 994 }
928 else 995 else
929 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 996 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
930 997
931 event (EV_A_ (W)w, EV_TIMEOUT); 998 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
932 } 999 }
933} 1000}
934 1001
935static void 1002static void
936periodics_reify (EV_P) 1003periodics_reify (EV_P)
937{ 1004{
938 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1005 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
939 { 1006 {
940 struct ev_periodic *w = periodics [0]; 1007 struct ev_periodic *w = periodics [0];
941 1008
942 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1009 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
943 1010
944 /* first reschedule or stop timer */ 1011 /* first reschedule or stop timer */
945 if (w->interval) 1012 if (w->reschedule_cb)
946 { 1013 {
1014 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1015
1016 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1017 downheap ((WT *)periodics, periodiccnt, 0);
1018 }
1019 else if (w->interval)
1020 {
947 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1021 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
948 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1022 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
949 downheap ((WT *)periodics, periodiccnt, 0); 1023 downheap ((WT *)periodics, periodiccnt, 0);
950 } 1024 }
951 else 1025 else
952 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1026 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
953 1027
954 event (EV_A_ (W)w, EV_PERIODIC); 1028 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
955 } 1029 }
956} 1030}
957 1031
958static void 1032static void
959periodics_reschedule (EV_P) 1033periodics_reschedule (EV_P)
… …
963 /* adjust periodics after time jump */ 1037 /* adjust periodics after time jump */
964 for (i = 0; i < periodiccnt; ++i) 1038 for (i = 0; i < periodiccnt; ++i)
965 { 1039 {
966 struct ev_periodic *w = periodics [i]; 1040 struct ev_periodic *w = periodics [i];
967 1041
1042 if (w->reschedule_cb)
1043 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
968 if (w->interval) 1044 else if (w->interval)
969 {
970 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1045 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
971
972 if (fabs (diff) >= 1e-4)
973 {
974 ev_periodic_stop (EV_A_ w);
975 ev_periodic_start (EV_A_ w);
976
977 i = 0; /* restart loop, inefficient, but time jumps should be rare */
978 }
979 }
980 } 1046 }
1047
1048 /* now rebuild the heap */
1049 for (i = periodiccnt >> 1; i--; )
1050 downheap ((WT *)periodics, periodiccnt, i);
981} 1051}
982 1052
983inline int 1053inline int
984time_update_monotonic (EV_P) 1054time_update_monotonic (EV_P)
985{ 1055{
986 mn_now = get_clock (); 1056 mn_now = get_clock ();
987 1057
988 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1058 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
989 { 1059 {
990 rt_now = rtmn_diff + mn_now; 1060 ev_rt_now = rtmn_diff + mn_now;
991 return 0; 1061 return 0;
992 } 1062 }
993 else 1063 else
994 { 1064 {
995 now_floor = mn_now; 1065 now_floor = mn_now;
996 rt_now = ev_time (); 1066 ev_rt_now = ev_time ();
997 return 1; 1067 return 1;
998 } 1068 }
999} 1069}
1000 1070
1001static void 1071static void
… …
1010 { 1080 {
1011 ev_tstamp odiff = rtmn_diff; 1081 ev_tstamp odiff = rtmn_diff;
1012 1082
1013 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1083 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1014 { 1084 {
1015 rtmn_diff = rt_now - mn_now; 1085 rtmn_diff = ev_rt_now - mn_now;
1016 1086
1017 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1087 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1018 return; /* all is well */ 1088 return; /* all is well */
1019 1089
1020 rt_now = ev_time (); 1090 ev_rt_now = ev_time ();
1021 mn_now = get_clock (); 1091 mn_now = get_clock ();
1022 now_floor = mn_now; 1092 now_floor = mn_now;
1023 } 1093 }
1024 1094
1025 periodics_reschedule (EV_A); 1095 periodics_reschedule (EV_A);
… …
1028 } 1098 }
1029 } 1099 }
1030 else 1100 else
1031#endif 1101#endif
1032 { 1102 {
1033 rt_now = ev_time (); 1103 ev_rt_now = ev_time ();
1034 1104
1035 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1105 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1036 { 1106 {
1037 periodics_reschedule (EV_A); 1107 periodics_reschedule (EV_A);
1038 1108
1039 /* adjust timers. this is easy, as the offset is the same for all */ 1109 /* adjust timers. this is easy, as the offset is the same for all */
1040 for (i = 0; i < timercnt; ++i) 1110 for (i = 0; i < timercnt; ++i)
1041 ((WT)timers [i])->at += rt_now - mn_now; 1111 ((WT)timers [i])->at += ev_rt_now - mn_now;
1042 } 1112 }
1043 1113
1044 mn_now = rt_now; 1114 mn_now = ev_rt_now;
1045 } 1115 }
1046} 1116}
1047 1117
1048void 1118void
1049ev_ref (EV_P) 1119ev_ref (EV_P)
… …
1081 /* update fd-related kernel structures */ 1151 /* update fd-related kernel structures */
1082 fd_reify (EV_A); 1152 fd_reify (EV_A);
1083 1153
1084 /* calculate blocking time */ 1154 /* calculate blocking time */
1085 1155
1086 /* we only need this for !monotonic clockor timers, but as we basically 1156 /* we only need this for !monotonic clock or timers, but as we basically
1087 always have timers, we just calculate it always */ 1157 always have timers, we just calculate it always */
1088#if EV_USE_MONOTONIC 1158#if EV_USE_MONOTONIC
1089 if (expect_true (have_monotonic)) 1159 if (expect_true (have_monotonic))
1090 time_update_monotonic (EV_A); 1160 time_update_monotonic (EV_A);
1091 else 1161 else
1092#endif 1162#endif
1093 { 1163 {
1094 rt_now = ev_time (); 1164 ev_rt_now = ev_time ();
1095 mn_now = rt_now; 1165 mn_now = ev_rt_now;
1096 } 1166 }
1097 1167
1098 if (flags & EVLOOP_NONBLOCK || idlecnt) 1168 if (flags & EVLOOP_NONBLOCK || idlecnt)
1099 block = 0.; 1169 block = 0.;
1100 else 1170 else
… …
1107 if (block > to) block = to; 1177 if (block > to) block = to;
1108 } 1178 }
1109 1179
1110 if (periodiccnt) 1180 if (periodiccnt)
1111 { 1181 {
1112 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1182 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1113 if (block > to) block = to; 1183 if (block > to) block = to;
1114 } 1184 }
1115 1185
1116 if (block < 0.) block = 0.; 1186 if (block < 0.) block = 0.;
1117 } 1187 }
1118 1188
1119 method_poll (EV_A_ block); 1189 method_poll (EV_A_ block);
1120 1190
1121 /* update rt_now, do magic */ 1191 /* update ev_rt_now, do magic */
1122 time_update (EV_A); 1192 time_update (EV_A);
1123 1193
1124 /* queue pending timers and reschedule them */ 1194 /* queue pending timers and reschedule them */
1125 timers_reify (EV_A); /* relative timers called last */ 1195 timers_reify (EV_A); /* relative timers called last */
1126 periodics_reify (EV_A); /* absolute timers called first */ 1196 periodics_reify (EV_A); /* absolute timers called first */
1127 1197
1128 /* queue idle watchers unless io or timers are pending */ 1198 /* queue idle watchers unless io or timers are pending */
1129 if (!pendingcnt) 1199 if (idlecnt && !any_pending (EV_A))
1130 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1200 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1131 1201
1132 /* queue check watchers, to be executed first */ 1202 /* queue check watchers, to be executed first */
1133 if (checkcnt) 1203 if (checkcnt)
1134 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1204 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1222{ 1292{
1223 ev_clear_pending (EV_A_ (W)w); 1293 ev_clear_pending (EV_A_ (W)w);
1224 if (!ev_is_active (w)) 1294 if (!ev_is_active (w))
1225 return; 1295 return;
1226 1296
1297 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1298
1227 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1299 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1228 ev_stop (EV_A_ (W)w); 1300 ev_stop (EV_A_ (W)w);
1229 1301
1230 fd_change (EV_A_ w->fd); 1302 fd_change (EV_A_ w->fd);
1231} 1303}
… …
1272ev_timer_again (EV_P_ struct ev_timer *w) 1344ev_timer_again (EV_P_ struct ev_timer *w)
1273{ 1345{
1274 if (ev_is_active (w)) 1346 if (ev_is_active (w))
1275 { 1347 {
1276 if (w->repeat) 1348 if (w->repeat)
1277 {
1278 ((WT)w)->at = mn_now + w->repeat;
1279 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1349 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat);
1280 }
1281 else 1350 else
1282 ev_timer_stop (EV_A_ w); 1351 ev_timer_stop (EV_A_ w);
1283 } 1352 }
1284 else if (w->repeat) 1353 else if (w->repeat)
1285 ev_timer_start (EV_A_ w); 1354 ev_timer_start (EV_A_ w);
… …
1289ev_periodic_start (EV_P_ struct ev_periodic *w) 1358ev_periodic_start (EV_P_ struct ev_periodic *w)
1290{ 1359{
1291 if (ev_is_active (w)) 1360 if (ev_is_active (w))
1292 return; 1361 return;
1293 1362
1363 if (w->reschedule_cb)
1364 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1365 else if (w->interval)
1366 {
1294 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1367 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1295
1296 /* this formula differs from the one in periodic_reify because we do not always round up */ 1368 /* this formula differs from the one in periodic_reify because we do not always round up */
1297 if (w->interval)
1298 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1369 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1370 }
1299 1371
1300 ev_start (EV_A_ (W)w, ++periodiccnt); 1372 ev_start (EV_A_ (W)w, ++periodiccnt);
1301 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1373 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1302 periodics [periodiccnt - 1] = w; 1374 periodics [periodiccnt - 1] = w;
1303 upheap ((WT *)periodics, periodiccnt - 1); 1375 upheap ((WT *)periodics, periodiccnt - 1);
… …
1319 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1391 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1320 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1392 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1321 } 1393 }
1322 1394
1323 ev_stop (EV_A_ (W)w); 1395 ev_stop (EV_A_ (W)w);
1396}
1397
1398void
1399ev_periodic_again (EV_P_ struct ev_periodic *w)
1400{
1401 /* TODO: use adjustheap and recalculation */
1402 ev_periodic_stop (EV_A_ w);
1403 ev_periodic_start (EV_A_ w);
1324} 1404}
1325 1405
1326void 1406void
1327ev_idle_start (EV_P_ struct ev_idle *w) 1407ev_idle_start (EV_P_ struct ev_idle *w)
1328{ 1408{
… …
1505 else 1585 else
1506 { 1586 {
1507 once->cb = cb; 1587 once->cb = cb;
1508 once->arg = arg; 1588 once->arg = arg;
1509 1589
1510 ev_watcher_init (&once->io, once_cb_io); 1590 ev_init (&once->io, once_cb_io);
1511 if (fd >= 0) 1591 if (fd >= 0)
1512 { 1592 {
1513 ev_io_set (&once->io, fd, events); 1593 ev_io_set (&once->io, fd, events);
1514 ev_io_start (EV_A_ &once->io); 1594 ev_io_start (EV_A_ &once->io);
1515 } 1595 }
1516 1596
1517 ev_watcher_init (&once->to, once_cb_to); 1597 ev_init (&once->to, once_cb_to);
1518 if (timeout >= 0.) 1598 if (timeout >= 0.)
1519 { 1599 {
1520 ev_timer_set (&once->to, timeout, 0.); 1600 ev_timer_set (&once->to, timeout, 0.);
1521 ev_timer_start (EV_A_ &once->to); 1601 ev_timer_start (EV_A_ &once->to);
1522 } 1602 }
1523 } 1603 }
1524} 1604}
1525 1605
1606#ifdef __cplusplus
1607}
1608#endif
1609

Diff Legend

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