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

Comparing libev/ev.c (file contents):
Revision 1.75 by root, Tue Nov 6 19:29:20 2007 UTC vs.
Revision 1.98 by root, Sun Nov 11 02:05:20 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
40# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif
43# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif
37# endif 46# endif
38 47
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
40# define EV_USE_SELECT 1 49# define EV_USE_SELECT 1
41# endif 50# endif
42 51
43# if HAVE_POLL && HAVE_POLL_H 52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
44# define EV_USE_POLL 1 53# define EV_USE_POLL 1
45# endif 54# endif
46 55
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 56# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
48# define EV_USE_EPOLL 1 57# define EV_USE_EPOLL 1
49# endif 58# endif
50 59
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
52# define EV_USE_KQUEUE 1 61# define EV_USE_KQUEUE 1
53# endif 62# endif
54 63
55#endif 64#endif
56 65
… …
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 135#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) */ 136#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 */ 137#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 */ 138/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
130 139
140#ifdef EV_H
141# include EV_H
142#else
131#include "ev.h" 143# include "ev.h"
144#endif
132 145
133#if __GNUC__ >= 3 146#if __GNUC__ >= 3
134# define expect(expr,value) __builtin_expect ((expr),(value)) 147# define expect(expr,value) __builtin_expect ((expr),(value))
135# define inline inline 148# define inline inline
136#else 149#else
… …
148typedef struct ev_watcher_list *WL; 161typedef struct ev_watcher_list *WL;
149typedef struct ev_watcher_time *WT; 162typedef struct ev_watcher_time *WT;
150 163
151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 164static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
152 165
166#ifdef WIN32
153#include "ev_win32.c" 167# include "ev_win32.c"
168#endif
154 169
155/*****************************************************************************/ 170/*****************************************************************************/
156 171
157static void (*syserr_cb)(const char *msg); 172static void (*syserr_cb)(const char *msg);
158 173
… …
215 int events; 230 int events;
216} ANPENDING; 231} ANPENDING;
217 232
218#if EV_MULTIPLICITY 233#if EV_MULTIPLICITY
219 234
220struct ev_loop 235 struct ev_loop
221{ 236 {
237 ev_tstamp ev_rt_now;
222# define VAR(name,decl) decl; 238 #define VAR(name,decl) decl;
223# include "ev_vars.h" 239 #include "ev_vars.h"
224};
225# undef VAR 240 #undef VAR
241 };
226# include "ev_wrap.h" 242 #include "ev_wrap.h"
243
244 struct ev_loop default_loop_struct;
245 static struct ev_loop *default_loop;
227 246
228#else 247#else
229 248
249 ev_tstamp ev_rt_now;
230# define VAR(name,decl) static decl; 250 #define VAR(name,decl) static decl;
231# include "ev_vars.h" 251 #include "ev_vars.h"
232# undef VAR 252 #undef VAR
253
254 static int default_loop;
233 255
234#endif 256#endif
235 257
236/*****************************************************************************/ 258/*****************************************************************************/
237 259
238inline ev_tstamp 260ev_tstamp
239ev_time (void) 261ev_time (void)
240{ 262{
241#if EV_USE_REALTIME 263#if EV_USE_REALTIME
242 struct timespec ts; 264 struct timespec ts;
243 clock_gettime (CLOCK_REALTIME, &ts); 265 clock_gettime (CLOCK_REALTIME, &ts);
… …
262#endif 284#endif
263 285
264 return ev_time (); 286 return ev_time ();
265} 287}
266 288
289#if EV_MULTIPLICITY
267ev_tstamp 290ev_tstamp
268ev_now (EV_P) 291ev_now (EV_P)
269{ 292{
270 return rt_now; 293 return ev_rt_now;
271} 294}
295#endif
272 296
273#define array_roundsize(type,n) ((n) | 4 & ~3) 297#define array_roundsize(type,n) ((n) | 4 & ~3)
274 298
275#define array_needsize(type,base,cur,cnt,init) \ 299#define array_needsize(type,base,cur,cnt,init) \
276 if (expect_false ((cnt) > cur)) \ 300 if (expect_false ((cnt) > cur)) \
… …
316 340
317 ++base; 341 ++base;
318 } 342 }
319} 343}
320 344
321static void 345void
322event (EV_P_ W w, int events) 346ev_feed_event (EV_P_ void *w, int revents)
323{ 347{
348 W w_ = (W)w;
349
324 if (w->pending) 350 if (w_->pending)
325 { 351 {
326 pendings [ABSPRI (w)][w->pending - 1].events |= events; 352 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
327 return; 353 return;
328 } 354 }
329 355
330 w->pending = ++pendingcnt [ABSPRI (w)]; 356 w_->pending = ++pendingcnt [ABSPRI (w_)];
331 array_needsize (ANPENDING, pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], (void)); 357 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
332 pendings [ABSPRI (w)][w->pending - 1].w = w; 358 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
333 pendings [ABSPRI (w)][w->pending - 1].events = events; 359 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
334} 360}
335 361
336static void 362static void
337queue_events (EV_P_ W *events, int eventcnt, int type) 363queue_events (EV_P_ W *events, int eventcnt, int type)
338{ 364{
339 int i; 365 int i;
340 366
341 for (i = 0; i < eventcnt; ++i) 367 for (i = 0; i < eventcnt; ++i)
342 event (EV_A_ events [i], type); 368 ev_feed_event (EV_A_ events [i], type);
343} 369}
344 370
345static void 371inline void
346fd_event (EV_P_ int fd, int events) 372fd_event (EV_P_ int fd, int revents)
347{ 373{
348 ANFD *anfd = anfds + fd; 374 ANFD *anfd = anfds + fd;
349 struct ev_io *w; 375 struct ev_io *w;
350 376
351 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 377 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
352 { 378 {
353 int ev = w->events & events; 379 int ev = w->events & revents;
354 380
355 if (ev) 381 if (ev)
356 event (EV_A_ (W)w, ev); 382 ev_feed_event (EV_A_ (W)w, ev);
357 } 383 }
384}
385
386void
387ev_feed_fd_event (EV_P_ int fd, int revents)
388{
389 fd_event (EV_A_ fd, revents);
358} 390}
359 391
360/*****************************************************************************/ 392/*****************************************************************************/
361 393
362static void 394static void
… …
403 struct ev_io *w; 435 struct ev_io *w;
404 436
405 while ((w = (struct ev_io *)anfds [fd].head)) 437 while ((w = (struct ev_io *)anfds [fd].head))
406 { 438 {
407 ev_io_stop (EV_A_ w); 439 ev_io_stop (EV_A_ w);
408 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 440 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
409 } 441 }
410} 442}
411 443
412static int 444static int
413fd_valid (int fd) 445fd_valid (int fd)
… …
501 533
502 heap [k] = w; 534 heap [k] = w;
503 ((W)heap [k])->active = k + 1; 535 ((W)heap [k])->active = k + 1;
504} 536}
505 537
538inline void
539adjustheap (WT *heap, int N, int k, ev_tstamp at)
540{
541 ev_tstamp old_at = heap [k]->at;
542 heap [k]->at = at;
543
544 if (old_at < at)
545 downheap (heap, N, k);
546 else
547 upheap (heap, k);
548}
549
506/*****************************************************************************/ 550/*****************************************************************************/
507 551
508typedef struct 552typedef struct
509{ 553{
510 WL head; 554 WL head;
… …
550#endif 594#endif
551 errno = old_errno; 595 errno = old_errno;
552 } 596 }
553} 597}
554 598
599void
600ev_feed_signal_event (EV_P_ int signum)
601{
602 WL w;
603
604#if EV_MULTIPLICITY
605 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
606#endif
607
608 --signum;
609
610 if (signum < 0 || signum >= signalmax)
611 return;
612
613 signals [signum].gotsig = 0;
614
615 for (w = signals [signum].head; w; w = w->next)
616 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
617}
618
555static void 619static void
556sigcb (EV_P_ struct ev_io *iow, int revents) 620sigcb (EV_P_ struct ev_io *iow, int revents)
557{ 621{
558 WL w;
559 int signum; 622 int signum;
560 623
561#ifdef WIN32 624#ifdef WIN32
562 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT); 625 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
563#else 626#else
… …
565#endif 628#endif
566 gotsig = 0; 629 gotsig = 0;
567 630
568 for (signum = signalmax; signum--; ) 631 for (signum = signalmax; signum--; )
569 if (signals [signum].gotsig) 632 if (signals [signum].gotsig)
570 { 633 ev_feed_signal_event (EV_A_ signum + 1);
571 signals [signum].gotsig = 0;
572
573 for (w = signals [signum].head; w; w = w->next)
574 event (EV_A_ (W)w, EV_SIGNAL);
575 }
576} 634}
577 635
578static void 636static void
579siginit (EV_P) 637siginit (EV_P)
580{ 638{
… …
613 if (w->pid == pid || !w->pid) 671 if (w->pid == pid || !w->pid)
614 { 672 {
615 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 673 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
616 w->rpid = pid; 674 w->rpid = pid;
617 w->rstatus = status; 675 w->rstatus = status;
618 event (EV_A_ (W)w, EV_CHILD); 676 ev_feed_event (EV_A_ (W)w, EV_CHILD);
619 } 677 }
620} 678}
621 679
622static void 680static void
623childcb (EV_P_ struct ev_signal *sw, int revents) 681childcb (EV_P_ struct ev_signal *sw, int revents)
… …
625 int pid, status; 683 int pid, status;
626 684
627 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 685 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
628 { 686 {
629 /* make sure we are called again until all childs have been reaped */ 687 /* make sure we are called again until all childs have been reaped */
630 event (EV_A_ (W)sw, EV_SIGNAL); 688 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
631 689
632 child_reap (EV_A_ sw, pid, pid, status); 690 child_reap (EV_A_ sw, pid, pid, status);
633 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 691 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
634 } 692 }
635} 693}
… …
692 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 750 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
693 have_monotonic = 1; 751 have_monotonic = 1;
694 } 752 }
695#endif 753#endif
696 754
697 rt_now = ev_time (); 755 ev_rt_now = ev_time ();
698 mn_now = get_clock (); 756 mn_now = get_clock ();
699 now_floor = mn_now; 757 now_floor = mn_now;
700 rtmn_diff = rt_now - mn_now; 758 rtmn_diff = ev_rt_now - mn_now;
701 759
702 if (methods == EVMETHOD_AUTO) 760 if (methods == EVMETHOD_AUTO)
703 if (!enable_secure () && getenv ("LIBEV_METHODS")) 761 if (!enable_secure () && getenv ("LIBEV_METHODS"))
704 methods = atoi (getenv ("LIBEV_METHODS")); 762 methods = atoi (getenv ("LIBEV_METHODS"));
705 else 763 else
… …
720#endif 778#endif
721#if EV_USE_SELECT 779#if EV_USE_SELECT
722 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 780 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
723#endif 781#endif
724 782
725 ev_watcher_init (&sigev, sigcb); 783 ev_init (&sigev, sigcb);
726 ev_set_priority (&sigev, EV_MAXPRI); 784 ev_set_priority (&sigev, EV_MAXPRI);
727 } 785 }
728} 786}
729 787
730void 788void
… …
752 array_free (pending, [i]); 810 array_free (pending, [i]);
753 811
754 /* have to use the microsoft-never-gets-it-right macro */ 812 /* have to use the microsoft-never-gets-it-right macro */
755 array_free_microshit (fdchange); 813 array_free_microshit (fdchange);
756 array_free_microshit (timer); 814 array_free_microshit (timer);
815#if EV_PERIODICS
757 array_free_microshit (periodic); 816 array_free_microshit (periodic);
817#endif
758 array_free_microshit (idle); 818 array_free_microshit (idle);
759 array_free_microshit (prepare); 819 array_free_microshit (prepare);
760 array_free_microshit (check); 820 array_free_microshit (check);
761 821
762 method = 0; 822 method = 0;
… …
820} 880}
821 881
822#endif 882#endif
823 883
824#if EV_MULTIPLICITY 884#if EV_MULTIPLICITY
825struct ev_loop default_loop_struct;
826static struct ev_loop *default_loop;
827
828struct ev_loop * 885struct ev_loop *
829#else 886#else
830static int default_loop;
831
832int 887int
833#endif 888#endif
834ev_default_loop (int methods) 889ev_default_loop (int methods)
835{ 890{
836 if (sigpipe [0] == sigpipe [1]) 891 if (sigpipe [0] == sigpipe [1])
… …
897 postfork = 1; 952 postfork = 1;
898} 953}
899 954
900/*****************************************************************************/ 955/*****************************************************************************/
901 956
957static int
958any_pending (EV_P)
959{
960 int pri;
961
962 for (pri = NUMPRI; pri--; )
963 if (pendingcnt [pri])
964 return 1;
965
966 return 0;
967}
968
902static void 969static void
903call_pending (EV_P) 970call_pending (EV_P)
904{ 971{
905 int pri; 972 int pri;
906 973
… …
910 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 977 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
911 978
912 if (p->w) 979 if (p->w)
913 { 980 {
914 p->w->pending = 0; 981 p->w->pending = 0;
915 p->w->cb (EV_A_ p->w, p->events); 982 EV_CB_INVOKE (p->w, p->events);
916 } 983 }
917 } 984 }
918} 985}
919 986
920static void 987static void
… …
928 995
929 /* first reschedule or stop timer */ 996 /* first reschedule or stop timer */
930 if (w->repeat) 997 if (w->repeat)
931 { 998 {
932 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 999 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1000
933 ((WT)w)->at = mn_now + w->repeat; 1001 ((WT)w)->at += w->repeat;
1002 if (((WT)w)->at < mn_now)
1003 ((WT)w)->at = mn_now;
1004
934 downheap ((WT *)timers, timercnt, 0); 1005 downheap ((WT *)timers, timercnt, 0);
935 } 1006 }
936 else 1007 else
937 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1008 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
938 1009
939 event (EV_A_ (W)w, EV_TIMEOUT); 1010 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
940 } 1011 }
941} 1012}
942 1013
1014#if EV_PERIODICS
943static void 1015static void
944periodics_reify (EV_P) 1016periodics_reify (EV_P)
945{ 1017{
946 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1018 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
947 { 1019 {
948 struct ev_periodic *w = periodics [0]; 1020 struct ev_periodic *w = periodics [0];
949 1021
950 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1022 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
951 1023
952 /* first reschedule or stop timer */ 1024 /* first reschedule or stop timer */
953 if (w->interval) 1025 if (w->reschedule_cb)
954 { 1026 {
1027 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1028
1029 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1030 downheap ((WT *)periodics, periodiccnt, 0);
1031 }
1032 else if (w->interval)
1033 {
955 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1034 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
956 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1035 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
957 downheap ((WT *)periodics, periodiccnt, 0); 1036 downheap ((WT *)periodics, periodiccnt, 0);
958 } 1037 }
959 else 1038 else
960 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1039 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
961 1040
962 event (EV_A_ (W)w, EV_PERIODIC); 1041 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
963 } 1042 }
964} 1043}
965 1044
966static void 1045static void
967periodics_reschedule (EV_P) 1046periodics_reschedule (EV_P)
… …
971 /* adjust periodics after time jump */ 1050 /* adjust periodics after time jump */
972 for (i = 0; i < periodiccnt; ++i) 1051 for (i = 0; i < periodiccnt; ++i)
973 { 1052 {
974 struct ev_periodic *w = periodics [i]; 1053 struct ev_periodic *w = periodics [i];
975 1054
1055 if (w->reschedule_cb)
1056 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
976 if (w->interval) 1057 else if (w->interval)
977 {
978 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1058 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
979
980 if (fabs (diff) >= 1e-4)
981 {
982 ev_periodic_stop (EV_A_ w);
983 ev_periodic_start (EV_A_ w);
984
985 i = 0; /* restart loop, inefficient, but time jumps should be rare */
986 }
987 }
988 } 1059 }
1060
1061 /* now rebuild the heap */
1062 for (i = periodiccnt >> 1; i--; )
1063 downheap ((WT *)periodics, periodiccnt, i);
989} 1064}
1065#endif
990 1066
991inline int 1067inline int
992time_update_monotonic (EV_P) 1068time_update_monotonic (EV_P)
993{ 1069{
994 mn_now = get_clock (); 1070 mn_now = get_clock ();
995 1071
996 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1072 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
997 { 1073 {
998 rt_now = rtmn_diff + mn_now; 1074 ev_rt_now = rtmn_diff + mn_now;
999 return 0; 1075 return 0;
1000 } 1076 }
1001 else 1077 else
1002 { 1078 {
1003 now_floor = mn_now; 1079 now_floor = mn_now;
1004 rt_now = ev_time (); 1080 ev_rt_now = ev_time ();
1005 return 1; 1081 return 1;
1006 } 1082 }
1007} 1083}
1008 1084
1009static void 1085static void
… …
1018 { 1094 {
1019 ev_tstamp odiff = rtmn_diff; 1095 ev_tstamp odiff = rtmn_diff;
1020 1096
1021 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1097 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1022 { 1098 {
1023 rtmn_diff = rt_now - mn_now; 1099 rtmn_diff = ev_rt_now - mn_now;
1024 1100
1025 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1101 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1026 return; /* all is well */ 1102 return; /* all is well */
1027 1103
1028 rt_now = ev_time (); 1104 ev_rt_now = ev_time ();
1029 mn_now = get_clock (); 1105 mn_now = get_clock ();
1030 now_floor = mn_now; 1106 now_floor = mn_now;
1031 } 1107 }
1032 1108
1109# if EV_PERIODICS
1033 periodics_reschedule (EV_A); 1110 periodics_reschedule (EV_A);
1111# endif
1034 /* no timer adjustment, as the monotonic clock doesn't jump */ 1112 /* no timer adjustment, as the monotonic clock doesn't jump */
1035 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1113 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1036 } 1114 }
1037 } 1115 }
1038 else 1116 else
1039#endif 1117#endif
1040 { 1118 {
1041 rt_now = ev_time (); 1119 ev_rt_now = ev_time ();
1042 1120
1043 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1121 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1044 { 1122 {
1123#if EV_PERIODICS
1045 periodics_reschedule (EV_A); 1124 periodics_reschedule (EV_A);
1125#endif
1046 1126
1047 /* adjust timers. this is easy, as the offset is the same for all */ 1127 /* adjust timers. this is easy, as the offset is the same for all */
1048 for (i = 0; i < timercnt; ++i) 1128 for (i = 0; i < timercnt; ++i)
1049 ((WT)timers [i])->at += rt_now - mn_now; 1129 ((WT)timers [i])->at += ev_rt_now - mn_now;
1050 } 1130 }
1051 1131
1052 mn_now = rt_now; 1132 mn_now = ev_rt_now;
1053 } 1133 }
1054} 1134}
1055 1135
1056void 1136void
1057ev_ref (EV_P) 1137ev_ref (EV_P)
… …
1089 /* update fd-related kernel structures */ 1169 /* update fd-related kernel structures */
1090 fd_reify (EV_A); 1170 fd_reify (EV_A);
1091 1171
1092 /* calculate blocking time */ 1172 /* calculate blocking time */
1093 1173
1094 /* we only need this for !monotonic clockor timers, but as we basically 1174 /* we only need this for !monotonic clock or timers, but as we basically
1095 always have timers, we just calculate it always */ 1175 always have timers, we just calculate it always */
1096#if EV_USE_MONOTONIC 1176#if EV_USE_MONOTONIC
1097 if (expect_true (have_monotonic)) 1177 if (expect_true (have_monotonic))
1098 time_update_monotonic (EV_A); 1178 time_update_monotonic (EV_A);
1099 else 1179 else
1100#endif 1180#endif
1101 { 1181 {
1102 rt_now = ev_time (); 1182 ev_rt_now = ev_time ();
1103 mn_now = rt_now; 1183 mn_now = ev_rt_now;
1104 } 1184 }
1105 1185
1106 if (flags & EVLOOP_NONBLOCK || idlecnt) 1186 if (flags & EVLOOP_NONBLOCK || idlecnt)
1107 block = 0.; 1187 block = 0.;
1108 else 1188 else
… …
1113 { 1193 {
1114 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1194 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1115 if (block > to) block = to; 1195 if (block > to) block = to;
1116 } 1196 }
1117 1197
1198#if EV_PERIODICS
1118 if (periodiccnt) 1199 if (periodiccnt)
1119 { 1200 {
1120 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1201 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1121 if (block > to) block = to; 1202 if (block > to) block = to;
1122 } 1203 }
1204#endif
1123 1205
1124 if (block < 0.) block = 0.; 1206 if (block < 0.) block = 0.;
1125 } 1207 }
1126 1208
1127 method_poll (EV_A_ block); 1209 method_poll (EV_A_ block);
1128 1210
1129 /* update rt_now, do magic */ 1211 /* update ev_rt_now, do magic */
1130 time_update (EV_A); 1212 time_update (EV_A);
1131 1213
1132 /* queue pending timers and reschedule them */ 1214 /* queue pending timers and reschedule them */
1133 timers_reify (EV_A); /* relative timers called last */ 1215 timers_reify (EV_A); /* relative timers called last */
1216#if EV_PERIODICS
1134 periodics_reify (EV_A); /* absolute timers called first */ 1217 periodics_reify (EV_A); /* absolute timers called first */
1218#endif
1135 1219
1136 /* queue idle watchers unless io or timers are pending */ 1220 /* queue idle watchers unless io or timers are pending */
1137 if (!pendingcnt) 1221 if (idlecnt && !any_pending (EV_A))
1138 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1222 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1139 1223
1140 /* queue check watchers, to be executed first */ 1224 /* queue check watchers, to be executed first */
1141 if (checkcnt) 1225 if (checkcnt)
1142 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1226 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1230{ 1314{
1231 ev_clear_pending (EV_A_ (W)w); 1315 ev_clear_pending (EV_A_ (W)w);
1232 if (!ev_is_active (w)) 1316 if (!ev_is_active (w))
1233 return; 1317 return;
1234 1318
1319 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1320
1235 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1321 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1236 ev_stop (EV_A_ (W)w); 1322 ev_stop (EV_A_ (W)w);
1237 1323
1238 fd_change (EV_A_ w->fd); 1324 fd_change (EV_A_ w->fd);
1239} 1325}
… …
1269 { 1355 {
1270 timers [((W)w)->active - 1] = timers [timercnt]; 1356 timers [((W)w)->active - 1] = timers [timercnt];
1271 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1357 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1272 } 1358 }
1273 1359
1274 ((WT)w)->at = w->repeat; 1360 ((WT)w)->at -= mn_now;
1275 1361
1276 ev_stop (EV_A_ (W)w); 1362 ev_stop (EV_A_ (W)w);
1277} 1363}
1278 1364
1279void 1365void
1280ev_timer_again (EV_P_ struct ev_timer *w) 1366ev_timer_again (EV_P_ struct ev_timer *w)
1281{ 1367{
1282 if (ev_is_active (w)) 1368 if (ev_is_active (w))
1283 { 1369 {
1284 if (w->repeat) 1370 if (w->repeat)
1285 {
1286 ((WT)w)->at = mn_now + w->repeat;
1287 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1371 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat);
1288 }
1289 else 1372 else
1290 ev_timer_stop (EV_A_ w); 1373 ev_timer_stop (EV_A_ w);
1291 } 1374 }
1292 else if (w->repeat) 1375 else if (w->repeat)
1293 ev_timer_start (EV_A_ w); 1376 ev_timer_start (EV_A_ w);
1294} 1377}
1295 1378
1379#if EV_PERIODICS
1296void 1380void
1297ev_periodic_start (EV_P_ struct ev_periodic *w) 1381ev_periodic_start (EV_P_ struct ev_periodic *w)
1298{ 1382{
1299 if (ev_is_active (w)) 1383 if (ev_is_active (w))
1300 return; 1384 return;
1301 1385
1386 if (w->reschedule_cb)
1387 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1388 else if (w->interval)
1389 {
1302 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1390 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1303
1304 /* this formula differs from the one in periodic_reify because we do not always round up */ 1391 /* this formula differs from the one in periodic_reify because we do not always round up */
1305 if (w->interval)
1306 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1392 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1393 }
1307 1394
1308 ev_start (EV_A_ (W)w, ++periodiccnt); 1395 ev_start (EV_A_ (W)w, ++periodiccnt);
1309 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1396 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1310 periodics [periodiccnt - 1] = w; 1397 periodics [periodiccnt - 1] = w;
1311 upheap ((WT *)periodics, periodiccnt - 1); 1398 upheap ((WT *)periodics, periodiccnt - 1);
… …
1330 1417
1331 ev_stop (EV_A_ (W)w); 1418 ev_stop (EV_A_ (W)w);
1332} 1419}
1333 1420
1334void 1421void
1422ev_periodic_again (EV_P_ struct ev_periodic *w)
1423{
1424 /* TODO: use adjustheap and recalculation */
1425 ev_periodic_stop (EV_A_ w);
1426 ev_periodic_start (EV_A_ w);
1427}
1428#endif
1429
1430void
1335ev_idle_start (EV_P_ struct ev_idle *w) 1431ev_idle_start (EV_P_ struct ev_idle *w)
1336{ 1432{
1337 if (ev_is_active (w)) 1433 if (ev_is_active (w))
1338 return; 1434 return;
1339 1435
… …
1388 1484
1389void 1485void
1390ev_check_stop (EV_P_ struct ev_check *w) 1486ev_check_stop (EV_P_ struct ev_check *w)
1391{ 1487{
1392 ev_clear_pending (EV_A_ (W)w); 1488 ev_clear_pending (EV_A_ (W)w);
1393 if (ev_is_active (w)) 1489 if (!ev_is_active (w))
1394 return; 1490 return;
1395 1491
1396 checks [((W)w)->active - 1] = checks [--checkcnt]; 1492 checks [((W)w)->active - 1] = checks [--checkcnt];
1397 ev_stop (EV_A_ (W)w); 1493 ev_stop (EV_A_ (W)w);
1398} 1494}
… …
1459 1555
1460void 1556void
1461ev_child_stop (EV_P_ struct ev_child *w) 1557ev_child_stop (EV_P_ struct ev_child *w)
1462{ 1558{
1463 ev_clear_pending (EV_A_ (W)w); 1559 ev_clear_pending (EV_A_ (W)w);
1464 if (ev_is_active (w)) 1560 if (!ev_is_active (w))
1465 return; 1561 return;
1466 1562
1467 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1563 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1468 ev_stop (EV_A_ (W)w); 1564 ev_stop (EV_A_ (W)w);
1469} 1565}
… …
1513 else 1609 else
1514 { 1610 {
1515 once->cb = cb; 1611 once->cb = cb;
1516 once->arg = arg; 1612 once->arg = arg;
1517 1613
1518 ev_watcher_init (&once->io, once_cb_io); 1614 ev_init (&once->io, once_cb_io);
1519 if (fd >= 0) 1615 if (fd >= 0)
1520 { 1616 {
1521 ev_io_set (&once->io, fd, events); 1617 ev_io_set (&once->io, fd, events);
1522 ev_io_start (EV_A_ &once->io); 1618 ev_io_start (EV_A_ &once->io);
1523 } 1619 }
1524 1620
1525 ev_watcher_init (&once->to, once_cb_to); 1621 ev_init (&once->to, once_cb_to);
1526 if (timeout >= 0.) 1622 if (timeout >= 0.)
1527 { 1623 {
1528 ev_timer_set (&once->to, timeout, 0.); 1624 ev_timer_set (&once->to, timeout, 0.);
1529 ev_timer_start (EV_A_ &once->to); 1625 ev_timer_start (EV_A_ &once->to);
1530 } 1626 }
1531 } 1627 }
1532} 1628}
1533 1629
1630#ifdef __cplusplus
1631}
1632#endif
1633

Diff Legend

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