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

Comparing libev/ev.c (file contents):
Revision 1.71 by root, Tue Nov 6 13:17:55 2007 UTC vs.
Revision 1.100 by root, Sun Nov 11 04:02:54 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
… …
64#include <assert.h> 73#include <assert.h>
65#include <errno.h> 74#include <errno.h>
66#include <sys/types.h> 75#include <sys/types.h>
67#include <time.h> 76#include <time.h>
68 77
69#ifndef PERL
70# include <signal.h> 78#include <signal.h>
71#endif
72 79
73#ifndef WIN32 80#ifndef WIN32
74# include <unistd.h> 81# include <unistd.h>
75# include <sys/time.h> 82# include <sys/time.h>
76# include <sys/wait.h> 83# include <sys/wait.h>
… …
128#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) */
129#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) */
130#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 */
131/*#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 */
132 139
140#ifdef EV_H
141# include EV_H
142#else
133#include "ev.h" 143# include "ev.h"
144#endif
134 145
135#if __GNUC__ >= 3 146#if __GNUC__ >= 3
136# define expect(expr,value) __builtin_expect ((expr),(value)) 147# define expect(expr,value) __builtin_expect ((expr),(value))
137# define inline inline 148# define inline inline
138#else 149#else
… …
150typedef struct ev_watcher_list *WL; 161typedef struct ev_watcher_list *WL;
151typedef struct ev_watcher_time *WT; 162typedef struct ev_watcher_time *WT;
152 163
153static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 164static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
154 165
155#if WIN32 166#ifdef WIN32
156/* note: the comment below could not be substantiated, but what would I care */ 167# include "ev_win32.c"
157/* MSDN says this is required to handle SIGFPE */
158volatile double SIGFPE_REQ = 0.0f;
159#endif 168#endif
160 169
161/*****************************************************************************/ 170/*****************************************************************************/
162 171
163static void (*syserr_cb)(const char *msg); 172static void (*syserr_cb)(const char *msg);
… …
221 int events; 230 int events;
222} ANPENDING; 231} ANPENDING;
223 232
224#if EV_MULTIPLICITY 233#if EV_MULTIPLICITY
225 234
226struct ev_loop 235 struct ev_loop
227{ 236 {
237 ev_tstamp ev_rt_now;
238 #define ev_rt_now ((loop)->ev_rt_now)
228# define VAR(name,decl) decl; 239 #define VAR(name,decl) decl;
229# include "ev_vars.h" 240 #include "ev_vars.h"
230};
231# undef VAR 241 #undef VAR
242 };
232# include "ev_wrap.h" 243 #include "ev_wrap.h"
244
245 struct ev_loop default_loop_struct;
246 static struct ev_loop *default_loop;
233 247
234#else 248#else
235 249
250 ev_tstamp ev_rt_now;
236# define VAR(name,decl) static decl; 251 #define VAR(name,decl) static decl;
237# include "ev_vars.h" 252 #include "ev_vars.h"
238# undef VAR 253 #undef VAR
254
255 static int default_loop;
239 256
240#endif 257#endif
241 258
242/*****************************************************************************/ 259/*****************************************************************************/
243 260
244inline ev_tstamp 261ev_tstamp
245ev_time (void) 262ev_time (void)
246{ 263{
247#if EV_USE_REALTIME 264#if EV_USE_REALTIME
248 struct timespec ts; 265 struct timespec ts;
249 clock_gettime (CLOCK_REALTIME, &ts); 266 clock_gettime (CLOCK_REALTIME, &ts);
… …
268#endif 285#endif
269 286
270 return ev_time (); 287 return ev_time ();
271} 288}
272 289
290#if EV_MULTIPLICITY
273ev_tstamp 291ev_tstamp
274ev_now (EV_P) 292ev_now (EV_P)
275{ 293{
276 return rt_now; 294 return ev_rt_now;
277} 295}
296#endif
278 297
279#define array_roundsize(base,n) ((n) | 4 & ~3) 298#define array_roundsize(type,n) ((n) | 4 & ~3)
280 299
281#define array_needsize(base,cur,cnt,init) \ 300#define array_needsize(type,base,cur,cnt,init) \
282 if (expect_false ((cnt) > cur)) \ 301 if (expect_false ((cnt) > cur)) \
283 { \ 302 { \
284 int newcnt = cur; \ 303 int newcnt = cur; \
285 do \ 304 do \
286 { \ 305 { \
287 newcnt = array_roundsize (base, newcnt << 1); \ 306 newcnt = array_roundsize (type, newcnt << 1); \
288 } \ 307 } \
289 while ((cnt) > newcnt); \ 308 while ((cnt) > newcnt); \
290 \ 309 \
291 base = ev_realloc (base, sizeof (*base) * (newcnt)); \ 310 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
292 init (base + cur, newcnt - cur); \ 311 init (base + cur, newcnt - cur); \
293 cur = newcnt; \ 312 cur = newcnt; \
294 } 313 }
295 314
296#define array_slim(stem) \ 315#define array_slim(type,stem) \
297 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 316 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
298 { \ 317 { \
299 stem ## max = array_roundsize (stem ## cnt >> 1); \ 318 stem ## max = array_roundsize (stem ## cnt >> 1); \
300 base = ev_realloc (base, sizeof (*base) * (stem ## max)); \ 319 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
301 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 320 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
302 } 321 }
303 322
304/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */ 323/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
305/* bringing us everlasting joy in form of stupid extra macros that are not required in C */ 324/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
… …
322 341
323 ++base; 342 ++base;
324 } 343 }
325} 344}
326 345
327static void 346void
328event (EV_P_ W w, int events) 347ev_feed_event (EV_P_ void *w, int revents)
329{ 348{
349 W w_ = (W)w;
350
330 if (w->pending) 351 if (w_->pending)
331 { 352 {
332 pendings [ABSPRI (w)][w->pending - 1].events |= events; 353 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
333 return; 354 return;
334 } 355 }
335 356
336 w->pending = ++pendingcnt [ABSPRI (w)]; 357 w_->pending = ++pendingcnt [ABSPRI (w_)];
337 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], (void)); 358 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
338 pendings [ABSPRI (w)][w->pending - 1].w = w; 359 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
339 pendings [ABSPRI (w)][w->pending - 1].events = events; 360 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
340} 361}
341 362
342static void 363static void
343queue_events (EV_P_ W *events, int eventcnt, int type) 364queue_events (EV_P_ W *events, int eventcnt, int type)
344{ 365{
345 int i; 366 int i;
346 367
347 for (i = 0; i < eventcnt; ++i) 368 for (i = 0; i < eventcnt; ++i)
348 event (EV_A_ events [i], type); 369 ev_feed_event (EV_A_ events [i], type);
349} 370}
350 371
351static void 372inline void
352fd_event (EV_P_ int fd, int events) 373fd_event (EV_P_ int fd, int revents)
353{ 374{
354 ANFD *anfd = anfds + fd; 375 ANFD *anfd = anfds + fd;
355 struct ev_io *w; 376 struct ev_io *w;
356 377
357 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 378 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
358 { 379 {
359 int ev = w->events & events; 380 int ev = w->events & revents;
360 381
361 if (ev) 382 if (ev)
362 event (EV_A_ (W)w, ev); 383 ev_feed_event (EV_A_ (W)w, ev);
363 } 384 }
385}
386
387void
388ev_feed_fd_event (EV_P_ int fd, int revents)
389{
390 fd_event (EV_A_ fd, revents);
364} 391}
365 392
366/*****************************************************************************/ 393/*****************************************************************************/
367 394
368static void 395static void
… …
397 return; 424 return;
398 425
399 anfds [fd].reify = 1; 426 anfds [fd].reify = 1;
400 427
401 ++fdchangecnt; 428 ++fdchangecnt;
402 array_needsize (fdchanges, fdchangemax, fdchangecnt, (void)); 429 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
403 fdchanges [fdchangecnt - 1] = fd; 430 fdchanges [fdchangecnt - 1] = fd;
404} 431}
405 432
406static void 433static void
407fd_kill (EV_P_ int fd) 434fd_kill (EV_P_ int fd)
… …
409 struct ev_io *w; 436 struct ev_io *w;
410 437
411 while ((w = (struct ev_io *)anfds [fd].head)) 438 while ((w = (struct ev_io *)anfds [fd].head))
412 { 439 {
413 ev_io_stop (EV_A_ w); 440 ev_io_stop (EV_A_ w);
414 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 441 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
415 } 442 }
416} 443}
417 444
418static int 445static int
419fd_valid (int fd) 446fd_valid (int fd)
… …
507 534
508 heap [k] = w; 535 heap [k] = w;
509 ((W)heap [k])->active = k + 1; 536 ((W)heap [k])->active = k + 1;
510} 537}
511 538
539inline void
540adjustheap (WT *heap, int N, int k)
541{
542 upheap (heap, k);
543 downheap (heap, N, k);
544}
545
512/*****************************************************************************/ 546/*****************************************************************************/
513 547
514typedef struct 548typedef struct
515{ 549{
516 WL head; 550 WL head;
… …
547 581
548 if (!gotsig) 582 if (!gotsig)
549 { 583 {
550 int old_errno = errno; 584 int old_errno = errno;
551 gotsig = 1; 585 gotsig = 1;
586#ifdef WIN32
587 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
588#else
552 write (sigpipe [1], &signum, 1); 589 write (sigpipe [1], &signum, 1);
590#endif
553 errno = old_errno; 591 errno = old_errno;
554 } 592 }
555} 593}
556 594
595void
596ev_feed_signal_event (EV_P_ int signum)
597{
598 WL w;
599
600#if EV_MULTIPLICITY
601 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
602#endif
603
604 --signum;
605
606 if (signum < 0 || signum >= signalmax)
607 return;
608
609 signals [signum].gotsig = 0;
610
611 for (w = signals [signum].head; w; w = w->next)
612 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
613}
614
557static void 615static void
558sigcb (EV_P_ struct ev_io *iow, int revents) 616sigcb (EV_P_ struct ev_io *iow, int revents)
559{ 617{
560 WL w;
561 int signum; 618 int signum;
562 619
620#ifdef WIN32
621 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
622#else
563 read (sigpipe [0], &revents, 1); 623 read (sigpipe [0], &revents, 1);
624#endif
564 gotsig = 0; 625 gotsig = 0;
565 626
566 for (signum = signalmax; signum--; ) 627 for (signum = signalmax; signum--; )
567 if (signals [signum].gotsig) 628 if (signals [signum].gotsig)
568 { 629 ev_feed_signal_event (EV_A_ signum + 1);
569 signals [signum].gotsig = 0;
570
571 for (w = signals [signum].head; w; w = w->next)
572 event (EV_A_ (W)w, EV_SIGNAL);
573 }
574} 630}
575 631
576static void 632static void
577siginit (EV_P) 633siginit (EV_P)
578{ 634{
… …
611 if (w->pid == pid || !w->pid) 667 if (w->pid == pid || !w->pid)
612 { 668 {
613 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 669 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
614 w->rpid = pid; 670 w->rpid = pid;
615 w->rstatus = status; 671 w->rstatus = status;
616 event (EV_A_ (W)w, EV_CHILD); 672 ev_feed_event (EV_A_ (W)w, EV_CHILD);
617 } 673 }
618} 674}
619 675
620static void 676static void
621childcb (EV_P_ struct ev_signal *sw, int revents) 677childcb (EV_P_ struct ev_signal *sw, int revents)
… …
623 int pid, status; 679 int pid, status;
624 680
625 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 681 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
626 { 682 {
627 /* make sure we are called again until all childs have been reaped */ 683 /* make sure we are called again until all childs have been reaped */
628 event (EV_A_ (W)sw, EV_SIGNAL); 684 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
629 685
630 child_reap (EV_A_ sw, pid, pid, status); 686 child_reap (EV_A_ sw, pid, pid, status);
631 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 687 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
632 } 688 }
633} 689}
… …
690 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 746 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
691 have_monotonic = 1; 747 have_monotonic = 1;
692 } 748 }
693#endif 749#endif
694 750
695 rt_now = ev_time (); 751 ev_rt_now = ev_time ();
696 mn_now = get_clock (); 752 mn_now = get_clock ();
697 now_floor = mn_now; 753 now_floor = mn_now;
698 rtmn_diff = rt_now - mn_now; 754 rtmn_diff = ev_rt_now - mn_now;
699 755
700 if (methods == EVMETHOD_AUTO) 756 if (methods == EVMETHOD_AUTO)
701 if (!enable_secure () && getenv ("LIBEV_METHODS")) 757 if (!enable_secure () && getenv ("LIBEV_METHODS"))
702 methods = atoi (getenv ("LIBEV_METHODS")); 758 methods = atoi (getenv ("LIBEV_METHODS"));
703 else 759 else
… …
718#endif 774#endif
719#if EV_USE_SELECT 775#if EV_USE_SELECT
720 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 776 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
721#endif 777#endif
722 778
723 ev_watcher_init (&sigev, sigcb); 779 ev_init (&sigev, sigcb);
724 ev_set_priority (&sigev, EV_MAXPRI); 780 ev_set_priority (&sigev, EV_MAXPRI);
725 } 781 }
726} 782}
727 783
728void 784void
… …
750 array_free (pending, [i]); 806 array_free (pending, [i]);
751 807
752 /* have to use the microsoft-never-gets-it-right macro */ 808 /* have to use the microsoft-never-gets-it-right macro */
753 array_free_microshit (fdchange); 809 array_free_microshit (fdchange);
754 array_free_microshit (timer); 810 array_free_microshit (timer);
811#if EV_PERIODICS
755 array_free_microshit (periodic); 812 array_free_microshit (periodic);
813#endif
756 array_free_microshit (idle); 814 array_free_microshit (idle);
757 array_free_microshit (prepare); 815 array_free_microshit (prepare);
758 array_free_microshit (check); 816 array_free_microshit (check);
759 817
760 method = 0; 818 method = 0;
… …
818} 876}
819 877
820#endif 878#endif
821 879
822#if EV_MULTIPLICITY 880#if EV_MULTIPLICITY
823struct ev_loop default_loop_struct;
824static struct ev_loop *default_loop;
825
826struct ev_loop * 881struct ev_loop *
827#else 882#else
828static int default_loop;
829
830int 883int
831#endif 884#endif
832ev_default_loop (int methods) 885ev_default_loop (int methods)
833{ 886{
834 if (sigpipe [0] == sigpipe [1]) 887 if (sigpipe [0] == sigpipe [1])
… …
895 postfork = 1; 948 postfork = 1;
896} 949}
897 950
898/*****************************************************************************/ 951/*****************************************************************************/
899 952
953static int
954any_pending (EV_P)
955{
956 int pri;
957
958 for (pri = NUMPRI; pri--; )
959 if (pendingcnt [pri])
960 return 1;
961
962 return 0;
963}
964
900static void 965static void
901call_pending (EV_P) 966call_pending (EV_P)
902{ 967{
903 int pri; 968 int pri;
904 969
… …
908 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 973 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
909 974
910 if (p->w) 975 if (p->w)
911 { 976 {
912 p->w->pending = 0; 977 p->w->pending = 0;
913 p->w->cb (EV_A_ p->w, p->events); 978 EV_CB_INVOKE (p->w, p->events);
914 } 979 }
915 } 980 }
916} 981}
917 982
918static void 983static void
… …
926 991
927 /* first reschedule or stop timer */ 992 /* first reschedule or stop timer */
928 if (w->repeat) 993 if (w->repeat)
929 { 994 {
930 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 995 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
996
931 ((WT)w)->at = mn_now + w->repeat; 997 ((WT)w)->at += w->repeat;
998 if (((WT)w)->at < mn_now)
999 ((WT)w)->at = mn_now;
1000
932 downheap ((WT *)timers, timercnt, 0); 1001 downheap ((WT *)timers, timercnt, 0);
933 } 1002 }
934 else 1003 else
935 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1004 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
936 1005
937 event (EV_A_ (W)w, EV_TIMEOUT); 1006 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
938 } 1007 }
939} 1008}
940 1009
1010#if EV_PERIODICS
941static void 1011static void
942periodics_reify (EV_P) 1012periodics_reify (EV_P)
943{ 1013{
944 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1014 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
945 { 1015 {
946 struct ev_periodic *w = periodics [0]; 1016 struct ev_periodic *w = periodics [0];
947 1017
948 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1018 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
949 1019
950 /* first reschedule or stop timer */ 1020 /* first reschedule or stop timer */
951 if (w->interval) 1021 if (w->reschedule_cb)
952 { 1022 {
1023 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1024
1025 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1026 downheap ((WT *)periodics, periodiccnt, 0);
1027 }
1028 else if (w->interval)
1029 {
953 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1030 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
954 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1031 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
955 downheap ((WT *)periodics, periodiccnt, 0); 1032 downheap ((WT *)periodics, periodiccnt, 0);
956 } 1033 }
957 else 1034 else
958 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1035 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
959 1036
960 event (EV_A_ (W)w, EV_PERIODIC); 1037 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
961 } 1038 }
962} 1039}
963 1040
964static void 1041static void
965periodics_reschedule (EV_P) 1042periodics_reschedule (EV_P)
… …
969 /* adjust periodics after time jump */ 1046 /* adjust periodics after time jump */
970 for (i = 0; i < periodiccnt; ++i) 1047 for (i = 0; i < periodiccnt; ++i)
971 { 1048 {
972 struct ev_periodic *w = periodics [i]; 1049 struct ev_periodic *w = periodics [i];
973 1050
1051 if (w->reschedule_cb)
1052 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
974 if (w->interval) 1053 else if (w->interval)
975 {
976 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1054 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
977
978 if (fabs (diff) >= 1e-4)
979 {
980 ev_periodic_stop (EV_A_ w);
981 ev_periodic_start (EV_A_ w);
982
983 i = 0; /* restart loop, inefficient, but time jumps should be rare */
984 }
985 }
986 } 1055 }
1056
1057 /* now rebuild the heap */
1058 for (i = periodiccnt >> 1; i--; )
1059 downheap ((WT *)periodics, periodiccnt, i);
987} 1060}
1061#endif
988 1062
989inline int 1063inline int
990time_update_monotonic (EV_P) 1064time_update_monotonic (EV_P)
991{ 1065{
992 mn_now = get_clock (); 1066 mn_now = get_clock ();
993 1067
994 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1068 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
995 { 1069 {
996 rt_now = rtmn_diff + mn_now; 1070 ev_rt_now = rtmn_diff + mn_now;
997 return 0; 1071 return 0;
998 } 1072 }
999 else 1073 else
1000 { 1074 {
1001 now_floor = mn_now; 1075 now_floor = mn_now;
1002 rt_now = ev_time (); 1076 ev_rt_now = ev_time ();
1003 return 1; 1077 return 1;
1004 } 1078 }
1005} 1079}
1006 1080
1007static void 1081static void
… …
1016 { 1090 {
1017 ev_tstamp odiff = rtmn_diff; 1091 ev_tstamp odiff = rtmn_diff;
1018 1092
1019 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1093 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1020 { 1094 {
1021 rtmn_diff = rt_now - mn_now; 1095 rtmn_diff = ev_rt_now - mn_now;
1022 1096
1023 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1097 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1024 return; /* all is well */ 1098 return; /* all is well */
1025 1099
1026 rt_now = ev_time (); 1100 ev_rt_now = ev_time ();
1027 mn_now = get_clock (); 1101 mn_now = get_clock ();
1028 now_floor = mn_now; 1102 now_floor = mn_now;
1029 } 1103 }
1030 1104
1105# if EV_PERIODICS
1031 periodics_reschedule (EV_A); 1106 periodics_reschedule (EV_A);
1107# endif
1032 /* no timer adjustment, as the monotonic clock doesn't jump */ 1108 /* no timer adjustment, as the monotonic clock doesn't jump */
1033 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1109 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1034 } 1110 }
1035 } 1111 }
1036 else 1112 else
1037#endif 1113#endif
1038 { 1114 {
1039 rt_now = ev_time (); 1115 ev_rt_now = ev_time ();
1040 1116
1041 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1117 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1042 { 1118 {
1119#if EV_PERIODICS
1043 periodics_reschedule (EV_A); 1120 periodics_reschedule (EV_A);
1121#endif
1044 1122
1045 /* adjust timers. this is easy, as the offset is the same for all */ 1123 /* adjust timers. this is easy, as the offset is the same for all */
1046 for (i = 0; i < timercnt; ++i) 1124 for (i = 0; i < timercnt; ++i)
1047 ((WT)timers [i])->at += rt_now - mn_now; 1125 ((WT)timers [i])->at += ev_rt_now - mn_now;
1048 } 1126 }
1049 1127
1050 mn_now = rt_now; 1128 mn_now = ev_rt_now;
1051 } 1129 }
1052} 1130}
1053 1131
1054void 1132void
1055ev_ref (EV_P) 1133ev_ref (EV_P)
… …
1087 /* update fd-related kernel structures */ 1165 /* update fd-related kernel structures */
1088 fd_reify (EV_A); 1166 fd_reify (EV_A);
1089 1167
1090 /* calculate blocking time */ 1168 /* calculate blocking time */
1091 1169
1092 /* we only need this for !monotonic clockor timers, but as we basically 1170 /* we only need this for !monotonic clock or timers, but as we basically
1093 always have timers, we just calculate it always */ 1171 always have timers, we just calculate it always */
1094#if EV_USE_MONOTONIC 1172#if EV_USE_MONOTONIC
1095 if (expect_true (have_monotonic)) 1173 if (expect_true (have_monotonic))
1096 time_update_monotonic (EV_A); 1174 time_update_monotonic (EV_A);
1097 else 1175 else
1098#endif 1176#endif
1099 { 1177 {
1100 rt_now = ev_time (); 1178 ev_rt_now = ev_time ();
1101 mn_now = rt_now; 1179 mn_now = ev_rt_now;
1102 } 1180 }
1103 1181
1104 if (flags & EVLOOP_NONBLOCK || idlecnt) 1182 if (flags & EVLOOP_NONBLOCK || idlecnt)
1105 block = 0.; 1183 block = 0.;
1106 else 1184 else
… …
1111 { 1189 {
1112 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1190 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1113 if (block > to) block = to; 1191 if (block > to) block = to;
1114 } 1192 }
1115 1193
1194#if EV_PERIODICS
1116 if (periodiccnt) 1195 if (periodiccnt)
1117 { 1196 {
1118 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1197 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1119 if (block > to) block = to; 1198 if (block > to) block = to;
1120 } 1199 }
1200#endif
1121 1201
1122 if (block < 0.) block = 0.; 1202 if (block < 0.) block = 0.;
1123 } 1203 }
1124 1204
1125 method_poll (EV_A_ block); 1205 method_poll (EV_A_ block);
1126 1206
1127 /* update rt_now, do magic */ 1207 /* update ev_rt_now, do magic */
1128 time_update (EV_A); 1208 time_update (EV_A);
1129 1209
1130 /* queue pending timers and reschedule them */ 1210 /* queue pending timers and reschedule them */
1131 timers_reify (EV_A); /* relative timers called last */ 1211 timers_reify (EV_A); /* relative timers called last */
1212#if EV_PERIODICS
1132 periodics_reify (EV_A); /* absolute timers called first */ 1213 periodics_reify (EV_A); /* absolute timers called first */
1214#endif
1133 1215
1134 /* queue idle watchers unless io or timers are pending */ 1216 /* queue idle watchers unless io or timers are pending */
1135 if (!pendingcnt) 1217 if (idlecnt && !any_pending (EV_A))
1136 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1218 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1137 1219
1138 /* queue check watchers, to be executed first */ 1220 /* queue check watchers, to be executed first */
1139 if (checkcnt) 1221 if (checkcnt)
1140 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1222 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1215 return; 1297 return;
1216 1298
1217 assert (("ev_io_start called with negative fd", fd >= 0)); 1299 assert (("ev_io_start called with negative fd", fd >= 0));
1218 1300
1219 ev_start (EV_A_ (W)w, 1); 1301 ev_start (EV_A_ (W)w, 1);
1220 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1302 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1221 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1303 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1222 1304
1223 fd_change (EV_A_ fd); 1305 fd_change (EV_A_ fd);
1224} 1306}
1225 1307
… …
1228{ 1310{
1229 ev_clear_pending (EV_A_ (W)w); 1311 ev_clear_pending (EV_A_ (W)w);
1230 if (!ev_is_active (w)) 1312 if (!ev_is_active (w))
1231 return; 1313 return;
1232 1314
1315 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1316
1233 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1317 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1234 ev_stop (EV_A_ (W)w); 1318 ev_stop (EV_A_ (W)w);
1235 1319
1236 fd_change (EV_A_ w->fd); 1320 fd_change (EV_A_ w->fd);
1237} 1321}
… …
1245 ((WT)w)->at += mn_now; 1329 ((WT)w)->at += mn_now;
1246 1330
1247 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1331 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1248 1332
1249 ev_start (EV_A_ (W)w, ++timercnt); 1333 ev_start (EV_A_ (W)w, ++timercnt);
1250 array_needsize (timers, timermax, timercnt, (void)); 1334 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1251 timers [timercnt - 1] = w; 1335 timers [timercnt - 1] = w;
1252 upheap ((WT *)timers, timercnt - 1); 1336 upheap ((WT *)timers, timercnt - 1);
1253 1337
1254 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1338 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1255} 1339}
… …
1264 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1348 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1265 1349
1266 if (((W)w)->active < timercnt--) 1350 if (((W)w)->active < timercnt--)
1267 { 1351 {
1268 timers [((W)w)->active - 1] = timers [timercnt]; 1352 timers [((W)w)->active - 1] = timers [timercnt];
1269 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1353 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1270 } 1354 }
1271 1355
1272 ((WT)w)->at = w->repeat; 1356 ((WT)w)->at -= mn_now;
1273 1357
1274 ev_stop (EV_A_ (W)w); 1358 ev_stop (EV_A_ (W)w);
1275} 1359}
1276 1360
1277void 1361void
… …
1280 if (ev_is_active (w)) 1364 if (ev_is_active (w))
1281 { 1365 {
1282 if (w->repeat) 1366 if (w->repeat)
1283 { 1367 {
1284 ((WT)w)->at = mn_now + w->repeat; 1368 ((WT)w)->at = mn_now + w->repeat;
1285 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1369 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1286 } 1370 }
1287 else 1371 else
1288 ev_timer_stop (EV_A_ w); 1372 ev_timer_stop (EV_A_ w);
1289 } 1373 }
1290 else if (w->repeat) 1374 else if (w->repeat)
1291 ev_timer_start (EV_A_ w); 1375 ev_timer_start (EV_A_ w);
1292} 1376}
1293 1377
1378#if EV_PERIODICS
1294void 1379void
1295ev_periodic_start (EV_P_ struct ev_periodic *w) 1380ev_periodic_start (EV_P_ struct ev_periodic *w)
1296{ 1381{
1297 if (ev_is_active (w)) 1382 if (ev_is_active (w))
1298 return; 1383 return;
1299 1384
1385 if (w->reschedule_cb)
1386 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1387 else if (w->interval)
1388 {
1300 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1389 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1301
1302 /* this formula differs from the one in periodic_reify because we do not always round up */ 1390 /* this formula differs from the one in periodic_reify because we do not always round up */
1303 if (w->interval)
1304 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1391 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1392 }
1305 1393
1306 ev_start (EV_A_ (W)w, ++periodiccnt); 1394 ev_start (EV_A_ (W)w, ++periodiccnt);
1307 array_needsize (periodics, periodicmax, periodiccnt, (void)); 1395 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1308 periodics [periodiccnt - 1] = w; 1396 periodics [periodiccnt - 1] = w;
1309 upheap ((WT *)periodics, periodiccnt - 1); 1397 upheap ((WT *)periodics, periodiccnt - 1);
1310 1398
1311 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1399 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1312} 1400}
… …
1321 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1409 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1322 1410
1323 if (((W)w)->active < periodiccnt--) 1411 if (((W)w)->active < periodiccnt--)
1324 { 1412 {
1325 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1413 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1326 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1414 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1327 } 1415 }
1328 1416
1329 ev_stop (EV_A_ (W)w); 1417 ev_stop (EV_A_ (W)w);
1330} 1418}
1331 1419
1332void 1420void
1421ev_periodic_again (EV_P_ struct ev_periodic *w)
1422{
1423 /* TODO: use adjustheap and recalculation */
1424 ev_periodic_stop (EV_A_ w);
1425 ev_periodic_start (EV_A_ w);
1426}
1427#endif
1428
1429void
1333ev_idle_start (EV_P_ struct ev_idle *w) 1430ev_idle_start (EV_P_ struct ev_idle *w)
1334{ 1431{
1335 if (ev_is_active (w)) 1432 if (ev_is_active (w))
1336 return; 1433 return;
1337 1434
1338 ev_start (EV_A_ (W)w, ++idlecnt); 1435 ev_start (EV_A_ (W)w, ++idlecnt);
1339 array_needsize (idles, idlemax, idlecnt, (void)); 1436 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1340 idles [idlecnt - 1] = w; 1437 idles [idlecnt - 1] = w;
1341} 1438}
1342 1439
1343void 1440void
1344ev_idle_stop (EV_P_ struct ev_idle *w) 1441ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1356{ 1453{
1357 if (ev_is_active (w)) 1454 if (ev_is_active (w))
1358 return; 1455 return;
1359 1456
1360 ev_start (EV_A_ (W)w, ++preparecnt); 1457 ev_start (EV_A_ (W)w, ++preparecnt);
1361 array_needsize (prepares, preparemax, preparecnt, (void)); 1458 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1362 prepares [preparecnt - 1] = w; 1459 prepares [preparecnt - 1] = w;
1363} 1460}
1364 1461
1365void 1462void
1366ev_prepare_stop (EV_P_ struct ev_prepare *w) 1463ev_prepare_stop (EV_P_ struct ev_prepare *w)
1367{ 1464{
1368 ev_clear_pending (EV_A_ (W)w); 1465 ev_clear_pending (EV_A_ (W)w);
1369 if (ev_is_active (w)) 1466 if (!ev_is_active (w))
1370 return; 1467 return;
1371 1468
1372 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1469 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1373 ev_stop (EV_A_ (W)w); 1470 ev_stop (EV_A_ (W)w);
1374} 1471}
… …
1378{ 1475{
1379 if (ev_is_active (w)) 1476 if (ev_is_active (w))
1380 return; 1477 return;
1381 1478
1382 ev_start (EV_A_ (W)w, ++checkcnt); 1479 ev_start (EV_A_ (W)w, ++checkcnt);
1383 array_needsize (checks, checkmax, checkcnt, (void)); 1480 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1384 checks [checkcnt - 1] = w; 1481 checks [checkcnt - 1] = w;
1385} 1482}
1386 1483
1387void 1484void
1388ev_check_stop (EV_P_ struct ev_check *w) 1485ev_check_stop (EV_P_ struct ev_check *w)
1389{ 1486{
1390 ev_clear_pending (EV_A_ (W)w); 1487 ev_clear_pending (EV_A_ (W)w);
1391 if (ev_is_active (w)) 1488 if (!ev_is_active (w))
1392 return; 1489 return;
1393 1490
1394 checks [((W)w)->active - 1] = checks [--checkcnt]; 1491 checks [((W)w)->active - 1] = checks [--checkcnt];
1395 ev_stop (EV_A_ (W)w); 1492 ev_stop (EV_A_ (W)w);
1396} 1493}
… …
1409 return; 1506 return;
1410 1507
1411 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1508 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1412 1509
1413 ev_start (EV_A_ (W)w, 1); 1510 ev_start (EV_A_ (W)w, 1);
1414 array_needsize (signals, signalmax, w->signum, signals_init); 1511 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1415 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1512 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1416 1513
1417 if (!((WL)w)->next) 1514 if (!((WL)w)->next)
1418 { 1515 {
1419#if WIN32 1516#if WIN32
… …
1457 1554
1458void 1555void
1459ev_child_stop (EV_P_ struct ev_child *w) 1556ev_child_stop (EV_P_ struct ev_child *w)
1460{ 1557{
1461 ev_clear_pending (EV_A_ (W)w); 1558 ev_clear_pending (EV_A_ (W)w);
1462 if (ev_is_active (w)) 1559 if (!ev_is_active (w))
1463 return; 1560 return;
1464 1561
1465 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1562 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1466 ev_stop (EV_A_ (W)w); 1563 ev_stop (EV_A_ (W)w);
1467} 1564}
… …
1502} 1599}
1503 1600
1504void 1601void
1505ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1602ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1506{ 1603{
1507 struct ev_once *once = ev_malloc (sizeof (struct ev_once)); 1604 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1508 1605
1509 if (!once) 1606 if (!once)
1510 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1607 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1511 else 1608 else
1512 { 1609 {
1513 once->cb = cb; 1610 once->cb = cb;
1514 once->arg = arg; 1611 once->arg = arg;
1515 1612
1516 ev_watcher_init (&once->io, once_cb_io); 1613 ev_init (&once->io, once_cb_io);
1517 if (fd >= 0) 1614 if (fd >= 0)
1518 { 1615 {
1519 ev_io_set (&once->io, fd, events); 1616 ev_io_set (&once->io, fd, events);
1520 ev_io_start (EV_A_ &once->io); 1617 ev_io_start (EV_A_ &once->io);
1521 } 1618 }
1522 1619
1523 ev_watcher_init (&once->to, once_cb_to); 1620 ev_init (&once->to, once_cb_to);
1524 if (timeout >= 0.) 1621 if (timeout >= 0.)
1525 { 1622 {
1526 ev_timer_set (&once->to, timeout, 0.); 1623 ev_timer_set (&once->to, timeout, 0.);
1527 ev_timer_start (EV_A_ &once->to); 1624 ev_timer_start (EV_A_ &once->to);
1528 } 1625 }
1529 } 1626 }
1530} 1627}
1531 1628
1629#ifdef __cplusplus
1630}
1631#endif
1632

Diff Legend

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