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

Comparing libev/ev.c (file contents):
Revision 1.70 by root, Tue Nov 6 00:52:32 2007 UTC vs.
Revision 1.85 by root, Sat Nov 10 03:13:50 2007 UTC

… …
54 54
55#endif 55#endif
56 56
57#include <math.h> 57#include <math.h>
58#include <stdlib.h> 58#include <stdlib.h>
59#include <unistd.h>
60#include <fcntl.h> 59#include <fcntl.h>
61#include <signal.h>
62#include <stddef.h> 60#include <stddef.h>
63 61
64#include <stdio.h> 62#include <stdio.h>
65 63
66#include <assert.h> 64#include <assert.h>
67#include <errno.h> 65#include <errno.h>
68#include <sys/types.h> 66#include <sys/types.h>
67#include <time.h>
68
69#include <signal.h>
70
69#ifndef WIN32 71#ifndef WIN32
72# include <unistd.h>
73# include <sys/time.h>
70# include <sys/wait.h> 74# include <sys/wait.h>
71#endif 75#endif
72#include <sys/time.h>
73#include <time.h>
74
75/**/ 76/**/
76 77
77#ifndef EV_USE_MONOTONIC 78#ifndef EV_USE_MONOTONIC
78# define EV_USE_MONOTONIC 1 79# define EV_USE_MONOTONIC 1
79#endif 80#endif
… …
94# define EV_USE_KQUEUE 0 95# define EV_USE_KQUEUE 0
95#endif 96#endif
96 97
97#ifndef EV_USE_WIN32 98#ifndef EV_USE_WIN32
98# ifdef WIN32 99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
99# define EV_USE_WIN32 1 102# define EV_USE_SELECT 1
100# else 103# else
101# define EV_USE_WIN32 0 104# define EV_USE_WIN32 0
102# endif 105# endif
103#endif 106#endif
104 107
… …
123#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
124#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 127#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
125#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 128#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
126/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 129/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
127 130
131#ifdef EV_H
132# include EV_H
133#else
128#include "ev.h" 134# include "ev.h"
135#endif
129 136
130#if __GNUC__ >= 3 137#if __GNUC__ >= 3
131# define expect(expr,value) __builtin_expect ((expr),(value)) 138# define expect(expr,value) __builtin_expect ((expr),(value))
132# define inline inline 139# define inline inline
133#else 140#else
… …
145typedef struct ev_watcher_list *WL; 152typedef struct ev_watcher_list *WL;
146typedef struct ev_watcher_time *WT; 153typedef struct ev_watcher_time *WT;
147 154
148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 155static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
149 156
150#if WIN32 157#include "ev_win32.c"
151/* note: the comment below could not be substantiated, but what would I care */
152/* MSDN says this is required to handle SIGFPE */
153volatile double SIGFPE_REQ = 0.0f;
154#endif
155 158
156/*****************************************************************************/ 159/*****************************************************************************/
157 160
158static void (*syserr_cb)(const char *msg); 161static void (*syserr_cb)(const char *msg);
159 162
… …
216 int events; 219 int events;
217} ANPENDING; 220} ANPENDING;
218 221
219#if EV_MULTIPLICITY 222#if EV_MULTIPLICITY
220 223
221struct ev_loop 224 struct ev_loop
222{ 225 {
223# define VAR(name,decl) decl; 226 #define VAR(name,decl) decl;
224# include "ev_vars.h" 227 #include "ev_vars.h"
225};
226# undef VAR 228 #undef VAR
229 };
227# include "ev_wrap.h" 230 #include "ev_wrap.h"
231
232 struct ev_loop default_loop_struct;
233 static struct ev_loop *default_loop;
228 234
229#else 235#else
230 236
231# define VAR(name,decl) static decl; 237 #define VAR(name,decl) static decl;
232# include "ev_vars.h" 238 #include "ev_vars.h"
233# undef VAR 239 #undef VAR
240
241 static int default_loop;
234 242
235#endif 243#endif
236 244
237/*****************************************************************************/ 245/*****************************************************************************/
238 246
… …
263#endif 271#endif
264 272
265 return ev_time (); 273 return ev_time ();
266} 274}
267 275
276#if EV_MULTIPLICITY
268ev_tstamp 277ev_tstamp
269ev_now (EV_P) 278ev_now (EV_P)
270{ 279{
271 return rt_now; 280 return ev_rt_now;
272} 281}
282#endif
273 283
274#define array_roundsize(base,n) ((n) | 4 & ~3) 284#define array_roundsize(type,n) ((n) | 4 & ~3)
275 285
276#define array_needsize(base,cur,cnt,init) \ 286#define array_needsize(type,base,cur,cnt,init) \
277 if (expect_false ((cnt) > cur)) \ 287 if (expect_false ((cnt) > cur)) \
278 { \ 288 { \
279 int newcnt = cur; \ 289 int newcnt = cur; \
280 do \ 290 do \
281 { \ 291 { \
282 newcnt = array_roundsize (base, newcnt << 1); \ 292 newcnt = array_roundsize (type, newcnt << 1); \
283 } \ 293 } \
284 while ((cnt) > newcnt); \ 294 while ((cnt) > newcnt); \
285 \ 295 \
286 base = ev_realloc (base, sizeof (*base) * (newcnt)); \ 296 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
287 init (base + cur, newcnt - cur); \ 297 init (base + cur, newcnt - cur); \
288 cur = newcnt; \ 298 cur = newcnt; \
289 } 299 }
290 300
291#define array_slim(stem) \ 301#define array_slim(type,stem) \
292 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 302 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
293 { \ 303 { \
294 stem ## max = array_roundsize (stem ## cnt >> 1); \ 304 stem ## max = array_roundsize (stem ## cnt >> 1); \
295 base = ev_realloc (base, sizeof (*base) * (stem ## max)); \ 305 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
296 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 306 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
297 } 307 }
308
309/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
310/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
311#define array_free_microshit(stem) \
312 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
298 313
299#define array_free(stem, idx) \ 314#define array_free(stem, idx) \
300 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 315 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
301 316
302/*****************************************************************************/ 317/*****************************************************************************/
… …
312 327
313 ++base; 328 ++base;
314 } 329 }
315} 330}
316 331
317static void 332void
318event (EV_P_ W w, int events) 333ev_feed_event (EV_P_ void *w, int revents)
319{ 334{
335 W w_ = (W)w;
336
320 if (w->pending) 337 if (w_->pending)
321 { 338 {
322 pendings [ABSPRI (w)][w->pending - 1].events |= events; 339 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
323 return; 340 return;
324 } 341 }
325 342
326 w->pending = ++pendingcnt [ABSPRI (w)]; 343 w_->pending = ++pendingcnt [ABSPRI (w_)];
327 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 344 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
328 pendings [ABSPRI (w)][w->pending - 1].w = w; 345 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
329 pendings [ABSPRI (w)][w->pending - 1].events = events; 346 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
330} 347}
331 348
332static void 349static void
333queue_events (EV_P_ W *events, int eventcnt, int type) 350queue_events (EV_P_ W *events, int eventcnt, int type)
334{ 351{
335 int i; 352 int i;
336 353
337 for (i = 0; i < eventcnt; ++i) 354 for (i = 0; i < eventcnt; ++i)
338 event (EV_A_ events [i], type); 355 ev_feed_event (EV_A_ events [i], type);
339} 356}
340 357
341static void 358inline void
342fd_event (EV_P_ int fd, int events) 359fd_event (EV_P_ int fd, int revents)
343{ 360{
344 ANFD *anfd = anfds + fd; 361 ANFD *anfd = anfds + fd;
345 struct ev_io *w; 362 struct ev_io *w;
346 363
347 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 364 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
348 { 365 {
349 int ev = w->events & events; 366 int ev = w->events & revents;
350 367
351 if (ev) 368 if (ev)
352 event (EV_A_ (W)w, ev); 369 ev_feed_event (EV_A_ (W)w, ev);
353 } 370 }
371}
372
373void
374ev_feed_fd_event (EV_P_ int fd, int revents)
375{
376 fd_event (EV_A_ fd, revents);
354} 377}
355 378
356/*****************************************************************************/ 379/*****************************************************************************/
357 380
358static void 381static void
… …
387 return; 410 return;
388 411
389 anfds [fd].reify = 1; 412 anfds [fd].reify = 1;
390 413
391 ++fdchangecnt; 414 ++fdchangecnt;
392 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 415 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
393 fdchanges [fdchangecnt - 1] = fd; 416 fdchanges [fdchangecnt - 1] = fd;
394} 417}
395 418
396static void 419static void
397fd_kill (EV_P_ int fd) 420fd_kill (EV_P_ int fd)
… …
399 struct ev_io *w; 422 struct ev_io *w;
400 423
401 while ((w = (struct ev_io *)anfds [fd].head)) 424 while ((w = (struct ev_io *)anfds [fd].head))
402 { 425 {
403 ev_io_stop (EV_A_ w); 426 ev_io_stop (EV_A_ w);
404 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 427 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
405 } 428 }
429}
430
431static int
432fd_valid (int fd)
433{
434#ifdef WIN32
435 return !!win32_get_osfhandle (fd);
436#else
437 return fcntl (fd, F_GETFD) != -1;
438#endif
406} 439}
407 440
408/* called on EBADF to verify fds */ 441/* called on EBADF to verify fds */
409static void 442static void
410fd_ebadf (EV_P) 443fd_ebadf (EV_P)
411{ 444{
412 int fd; 445 int fd;
413 446
414 for (fd = 0; fd < anfdmax; ++fd) 447 for (fd = 0; fd < anfdmax; ++fd)
415 if (anfds [fd].events) 448 if (anfds [fd].events)
416 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 449 if (!fd_valid (fd) == -1 && errno == EBADF)
417 fd_kill (EV_A_ fd); 450 fd_kill (EV_A_ fd);
418} 451}
419 452
420/* called on ENOMEM in select/poll to kill some fds and retry */ 453/* called on ENOMEM in select/poll to kill some fds and retry */
421static void 454static void
… …
487 520
488 heap [k] = w; 521 heap [k] = w;
489 ((W)heap [k])->active = k + 1; 522 ((W)heap [k])->active = k + 1;
490} 523}
491 524
525inline void
526adjustheap (WT *heap, int N, int k, ev_tstamp at)
527{
528 ev_tstamp old_at = heap [k]->at;
529 heap [k]->at = at;
530
531 if (old_at < at)
532 downheap (heap, N, k);
533 else
534 upheap (heap, k);
535}
536
492/*****************************************************************************/ 537/*****************************************************************************/
493 538
494typedef struct 539typedef struct
495{ 540{
496 WL head; 541 WL head;
… …
527 572
528 if (!gotsig) 573 if (!gotsig)
529 { 574 {
530 int old_errno = errno; 575 int old_errno = errno;
531 gotsig = 1; 576 gotsig = 1;
577#ifdef WIN32
578 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
579#else
532 write (sigpipe [1], &signum, 1); 580 write (sigpipe [1], &signum, 1);
581#endif
533 errno = old_errno; 582 errno = old_errno;
534 } 583 }
535} 584}
536 585
586void
587ev_feed_signal_event (EV_P_ int signum)
588{
589 WL w;
590
591#if EV_MULTIPLICITY
592 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
593#endif
594
595 --signum;
596
597 if (signum < 0 || signum >= signalmax)
598 return;
599
600 signals [signum].gotsig = 0;
601
602 for (w = signals [signum].head; w; w = w->next)
603 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
604}
605
537static void 606static void
538sigcb (EV_P_ struct ev_io *iow, int revents) 607sigcb (EV_P_ struct ev_io *iow, int revents)
539{ 608{
540 WL w;
541 int signum; 609 int signum;
542 610
611#ifdef WIN32
612 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
613#else
543 read (sigpipe [0], &revents, 1); 614 read (sigpipe [0], &revents, 1);
615#endif
544 gotsig = 0; 616 gotsig = 0;
545 617
546 for (signum = signalmax; signum--; ) 618 for (signum = signalmax; signum--; )
547 if (signals [signum].gotsig) 619 if (signals [signum].gotsig)
548 { 620 ev_feed_signal_event (EV_A_ signum + 1);
549 signals [signum].gotsig = 0;
550
551 for (w = signals [signum].head; w; w = w->next)
552 event (EV_A_ (W)w, EV_SIGNAL);
553 }
554} 621}
555 622
556static void 623static void
557siginit (EV_P) 624siginit (EV_P)
558{ 625{
… …
570 ev_unref (EV_A); /* child watcher should not keep loop alive */ 637 ev_unref (EV_A); /* child watcher should not keep loop alive */
571} 638}
572 639
573/*****************************************************************************/ 640/*****************************************************************************/
574 641
642static struct ev_child *childs [PID_HASHSIZE];
643
575#ifndef WIN32 644#ifndef WIN32
576 645
577static struct ev_child *childs [PID_HASHSIZE];
578static struct ev_signal childev; 646static struct ev_signal childev;
579 647
580#ifndef WCONTINUED 648#ifndef WCONTINUED
581# define WCONTINUED 0 649# define WCONTINUED 0
582#endif 650#endif
… …
590 if (w->pid == pid || !w->pid) 658 if (w->pid == pid || !w->pid)
591 { 659 {
592 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 660 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
593 w->rpid = pid; 661 w->rpid = pid;
594 w->rstatus = status; 662 w->rstatus = status;
595 event (EV_A_ (W)w, EV_CHILD); 663 ev_feed_event (EV_A_ (W)w, EV_CHILD);
596 } 664 }
597} 665}
598 666
599static void 667static void
600childcb (EV_P_ struct ev_signal *sw, int revents) 668childcb (EV_P_ struct ev_signal *sw, int revents)
… …
602 int pid, status; 670 int pid, status;
603 671
604 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 672 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
605 { 673 {
606 /* make sure we are called again until all childs have been reaped */ 674 /* make sure we are called again until all childs have been reaped */
607 event (EV_A_ (W)sw, EV_SIGNAL); 675 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
608 676
609 child_reap (EV_A_ sw, pid, pid, status); 677 child_reap (EV_A_ sw, pid, pid, status);
610 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 678 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
611 } 679 }
612} 680}
… …
669 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 737 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
670 have_monotonic = 1; 738 have_monotonic = 1;
671 } 739 }
672#endif 740#endif
673 741
674 rt_now = ev_time (); 742 ev_rt_now = ev_time ();
675 mn_now = get_clock (); 743 mn_now = get_clock ();
676 now_floor = mn_now; 744 now_floor = mn_now;
677 rtmn_diff = rt_now - mn_now; 745 rtmn_diff = ev_rt_now - mn_now;
678 746
679 if (methods == EVMETHOD_AUTO) 747 if (methods == EVMETHOD_AUTO)
680 if (!enable_secure () && getenv ("LIBEV_METHODS")) 748 if (!enable_secure () && getenv ("LIBEV_METHODS"))
681 methods = atoi (getenv ("LIBEV_METHODS")); 749 methods = atoi (getenv ("LIBEV_METHODS"));
682 else 750 else
… …
697#endif 765#endif
698#if EV_USE_SELECT 766#if EV_USE_SELECT
699 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 767 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
700#endif 768#endif
701 769
702 ev_watcher_init (&sigev, sigcb); 770 ev_init (&sigev, sigcb);
703 ev_set_priority (&sigev, EV_MAXPRI); 771 ev_set_priority (&sigev, EV_MAXPRI);
704 } 772 }
705} 773}
706 774
707void 775void
… …
726#endif 794#endif
727 795
728 for (i = NUMPRI; i--; ) 796 for (i = NUMPRI; i--; )
729 array_free (pending, [i]); 797 array_free (pending, [i]);
730 798
799 /* have to use the microsoft-never-gets-it-right macro */
731 array_free (fdchange, ); 800 array_free_microshit (fdchange);
732 array_free (timer, ); 801 array_free_microshit (timer);
733 array_free (periodic, ); 802 array_free_microshit (periodic);
734 array_free (idle, ); 803 array_free_microshit (idle);
735 array_free (prepare, ); 804 array_free_microshit (prepare);
736 array_free (check, ); 805 array_free_microshit (check);
737 806
738 method = 0; 807 method = 0;
739} 808}
740 809
741static void 810static void
… …
796} 865}
797 866
798#endif 867#endif
799 868
800#if EV_MULTIPLICITY 869#if EV_MULTIPLICITY
801struct ev_loop default_loop_struct;
802static struct ev_loop *default_loop;
803
804struct ev_loop * 870struct ev_loop *
805#else 871#else
806static int default_loop;
807
808int 872int
809#endif 873#endif
810ev_default_loop (int methods) 874ev_default_loop (int methods)
811{ 875{
812 if (sigpipe [0] == sigpipe [1]) 876 if (sigpipe [0] == sigpipe [1])
… …
846{ 910{
847#if EV_MULTIPLICITY 911#if EV_MULTIPLICITY
848 struct ev_loop *loop = default_loop; 912 struct ev_loop *loop = default_loop;
849#endif 913#endif
850 914
915#ifndef WIN32
851 ev_ref (EV_A); /* child watcher */ 916 ev_ref (EV_A); /* child watcher */
852 ev_signal_stop (EV_A_ &childev); 917 ev_signal_stop (EV_A_ &childev);
918#endif
853 919
854 ev_ref (EV_A); /* signal watcher */ 920 ev_ref (EV_A); /* signal watcher */
855 ev_io_stop (EV_A_ &sigev); 921 ev_io_stop (EV_A_ &sigev);
856 922
857 close (sigpipe [0]); sigpipe [0] = 0; 923 close (sigpipe [0]); sigpipe [0] = 0;
… …
870 if (method) 936 if (method)
871 postfork = 1; 937 postfork = 1;
872} 938}
873 939
874/*****************************************************************************/ 940/*****************************************************************************/
941
942static int
943any_pending (EV_P)
944{
945 int pri;
946
947 for (pri = NUMPRI; pri--; )
948 if (pendingcnt [pri])
949 return 1;
950
951 return 0;
952}
875 953
876static void 954static void
877call_pending (EV_P) 955call_pending (EV_P)
878{ 956{
879 int pri; 957 int pri;
… …
884 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 962 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
885 963
886 if (p->w) 964 if (p->w)
887 { 965 {
888 p->w->pending = 0; 966 p->w->pending = 0;
889 p->w->cb (EV_A_ p->w, p->events); 967 EV_CB_INVOKE (p->w, p->events);
890 } 968 }
891 } 969 }
892} 970}
893 971
894static void 972static void
… …
908 downheap ((WT *)timers, timercnt, 0); 986 downheap ((WT *)timers, timercnt, 0);
909 } 987 }
910 else 988 else
911 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 989 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
912 990
913 event (EV_A_ (W)w, EV_TIMEOUT); 991 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
914 } 992 }
915} 993}
916 994
917static void 995static void
918periodics_reify (EV_P) 996periodics_reify (EV_P)
919{ 997{
920 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 998 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
921 { 999 {
922 struct ev_periodic *w = periodics [0]; 1000 struct ev_periodic *w = periodics [0];
923 1001
924 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1002 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
925 1003
926 /* first reschedule or stop timer */ 1004 /* first reschedule or stop timer */
927 if (w->interval) 1005 if (w->reschedule_cb)
928 { 1006 {
1007 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1008
1009 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1010 downheap ((WT *)periodics, periodiccnt, 0);
1011 }
1012 else if (w->interval)
1013 {
929 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1014 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
930 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1015 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
931 downheap ((WT *)periodics, periodiccnt, 0); 1016 downheap ((WT *)periodics, periodiccnt, 0);
932 } 1017 }
933 else 1018 else
934 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1019 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
935 1020
936 event (EV_A_ (W)w, EV_PERIODIC); 1021 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
937 } 1022 }
938} 1023}
939 1024
940static void 1025static void
941periodics_reschedule (EV_P) 1026periodics_reschedule (EV_P)
… …
945 /* adjust periodics after time jump */ 1030 /* adjust periodics after time jump */
946 for (i = 0; i < periodiccnt; ++i) 1031 for (i = 0; i < periodiccnt; ++i)
947 { 1032 {
948 struct ev_periodic *w = periodics [i]; 1033 struct ev_periodic *w = periodics [i];
949 1034
1035 if (w->reschedule_cb)
1036 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
950 if (w->interval) 1037 else if (w->interval)
951 {
952 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1038 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
953
954 if (fabs (diff) >= 1e-4)
955 {
956 ev_periodic_stop (EV_A_ w);
957 ev_periodic_start (EV_A_ w);
958
959 i = 0; /* restart loop, inefficient, but time jumps should be rare */
960 }
961 }
962 } 1039 }
1040
1041 /* now rebuild the heap */
1042 for (i = periodiccnt >> 1; i--; )
1043 downheap ((WT *)periodics, periodiccnt, i);
963} 1044}
964 1045
965inline int 1046inline int
966time_update_monotonic (EV_P) 1047time_update_monotonic (EV_P)
967{ 1048{
968 mn_now = get_clock (); 1049 mn_now = get_clock ();
969 1050
970 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1051 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
971 { 1052 {
972 rt_now = rtmn_diff + mn_now; 1053 ev_rt_now = rtmn_diff + mn_now;
973 return 0; 1054 return 0;
974 } 1055 }
975 else 1056 else
976 { 1057 {
977 now_floor = mn_now; 1058 now_floor = mn_now;
978 rt_now = ev_time (); 1059 ev_rt_now = ev_time ();
979 return 1; 1060 return 1;
980 } 1061 }
981} 1062}
982 1063
983static void 1064static void
… …
992 { 1073 {
993 ev_tstamp odiff = rtmn_diff; 1074 ev_tstamp odiff = rtmn_diff;
994 1075
995 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1076 for (i = 4; --i; ) /* loop a few times, before making important decisions */
996 { 1077 {
997 rtmn_diff = rt_now - mn_now; 1078 rtmn_diff = ev_rt_now - mn_now;
998 1079
999 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1080 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1000 return; /* all is well */ 1081 return; /* all is well */
1001 1082
1002 rt_now = ev_time (); 1083 ev_rt_now = ev_time ();
1003 mn_now = get_clock (); 1084 mn_now = get_clock ();
1004 now_floor = mn_now; 1085 now_floor = mn_now;
1005 } 1086 }
1006 1087
1007 periodics_reschedule (EV_A); 1088 periodics_reschedule (EV_A);
… …
1010 } 1091 }
1011 } 1092 }
1012 else 1093 else
1013#endif 1094#endif
1014 { 1095 {
1015 rt_now = ev_time (); 1096 ev_rt_now = ev_time ();
1016 1097
1017 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1098 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1018 { 1099 {
1019 periodics_reschedule (EV_A); 1100 periodics_reschedule (EV_A);
1020 1101
1021 /* adjust timers. this is easy, as the offset is the same for all */ 1102 /* adjust timers. this is easy, as the offset is the same for all */
1022 for (i = 0; i < timercnt; ++i) 1103 for (i = 0; i < timercnt; ++i)
1023 ((WT)timers [i])->at += rt_now - mn_now; 1104 ((WT)timers [i])->at += ev_rt_now - mn_now;
1024 } 1105 }
1025 1106
1026 mn_now = rt_now; 1107 mn_now = ev_rt_now;
1027 } 1108 }
1028} 1109}
1029 1110
1030void 1111void
1031ev_ref (EV_P) 1112ev_ref (EV_P)
… …
1063 /* update fd-related kernel structures */ 1144 /* update fd-related kernel structures */
1064 fd_reify (EV_A); 1145 fd_reify (EV_A);
1065 1146
1066 /* calculate blocking time */ 1147 /* calculate blocking time */
1067 1148
1068 /* we only need this for !monotonic clockor timers, but as we basically 1149 /* we only need this for !monotonic clock or timers, but as we basically
1069 always have timers, we just calculate it always */ 1150 always have timers, we just calculate it always */
1070#if EV_USE_MONOTONIC 1151#if EV_USE_MONOTONIC
1071 if (expect_true (have_monotonic)) 1152 if (expect_true (have_monotonic))
1072 time_update_monotonic (EV_A); 1153 time_update_monotonic (EV_A);
1073 else 1154 else
1074#endif 1155#endif
1075 { 1156 {
1076 rt_now = ev_time (); 1157 ev_rt_now = ev_time ();
1077 mn_now = rt_now; 1158 mn_now = ev_rt_now;
1078 } 1159 }
1079 1160
1080 if (flags & EVLOOP_NONBLOCK || idlecnt) 1161 if (flags & EVLOOP_NONBLOCK || idlecnt)
1081 block = 0.; 1162 block = 0.;
1082 else 1163 else
… …
1089 if (block > to) block = to; 1170 if (block > to) block = to;
1090 } 1171 }
1091 1172
1092 if (periodiccnt) 1173 if (periodiccnt)
1093 { 1174 {
1094 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1175 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1095 if (block > to) block = to; 1176 if (block > to) block = to;
1096 } 1177 }
1097 1178
1098 if (block < 0.) block = 0.; 1179 if (block < 0.) block = 0.;
1099 } 1180 }
1100 1181
1101 method_poll (EV_A_ block); 1182 method_poll (EV_A_ block);
1102 1183
1103 /* update rt_now, do magic */ 1184 /* update ev_rt_now, do magic */
1104 time_update (EV_A); 1185 time_update (EV_A);
1105 1186
1106 /* queue pending timers and reschedule them */ 1187 /* queue pending timers and reschedule them */
1107 timers_reify (EV_A); /* relative timers called last */ 1188 timers_reify (EV_A); /* relative timers called last */
1108 periodics_reify (EV_A); /* absolute timers called first */ 1189 periodics_reify (EV_A); /* absolute timers called first */
1109 1190
1110 /* queue idle watchers unless io or timers are pending */ 1191 /* queue idle watchers unless io or timers are pending */
1111 if (!pendingcnt) 1192 if (idlecnt && !any_pending (EV_A))
1112 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1193 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1113 1194
1114 /* queue check watchers, to be executed first */ 1195 /* queue check watchers, to be executed first */
1115 if (checkcnt) 1196 if (checkcnt)
1116 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1197 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1191 return; 1272 return;
1192 1273
1193 assert (("ev_io_start called with negative fd", fd >= 0)); 1274 assert (("ev_io_start called with negative fd", fd >= 0));
1194 1275
1195 ev_start (EV_A_ (W)w, 1); 1276 ev_start (EV_A_ (W)w, 1);
1196 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1277 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1197 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1278 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1198 1279
1199 fd_change (EV_A_ fd); 1280 fd_change (EV_A_ fd);
1200} 1281}
1201 1282
… …
1221 ((WT)w)->at += mn_now; 1302 ((WT)w)->at += mn_now;
1222 1303
1223 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1304 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1224 1305
1225 ev_start (EV_A_ (W)w, ++timercnt); 1306 ev_start (EV_A_ (W)w, ++timercnt);
1226 array_needsize (timers, timermax, timercnt, ); 1307 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1227 timers [timercnt - 1] = w; 1308 timers [timercnt - 1] = w;
1228 upheap ((WT *)timers, timercnt - 1); 1309 upheap ((WT *)timers, timercnt - 1);
1229 1310
1230 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1311 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1231} 1312}
… …
1254ev_timer_again (EV_P_ struct ev_timer *w) 1335ev_timer_again (EV_P_ struct ev_timer *w)
1255{ 1336{
1256 if (ev_is_active (w)) 1337 if (ev_is_active (w))
1257 { 1338 {
1258 if (w->repeat) 1339 if (w->repeat)
1259 {
1260 ((WT)w)->at = mn_now + w->repeat;
1261 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1340 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat);
1262 }
1263 else 1341 else
1264 ev_timer_stop (EV_A_ w); 1342 ev_timer_stop (EV_A_ w);
1265 } 1343 }
1266 else if (w->repeat) 1344 else if (w->repeat)
1267 ev_timer_start (EV_A_ w); 1345 ev_timer_start (EV_A_ w);
… …
1271ev_periodic_start (EV_P_ struct ev_periodic *w) 1349ev_periodic_start (EV_P_ struct ev_periodic *w)
1272{ 1350{
1273 if (ev_is_active (w)) 1351 if (ev_is_active (w))
1274 return; 1352 return;
1275 1353
1354 if (w->reschedule_cb)
1355 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1356 else if (w->interval)
1357 {
1276 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1358 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1277
1278 /* this formula differs from the one in periodic_reify because we do not always round up */ 1359 /* this formula differs from the one in periodic_reify because we do not always round up */
1279 if (w->interval)
1280 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1360 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1361 }
1281 1362
1282 ev_start (EV_A_ (W)w, ++periodiccnt); 1363 ev_start (EV_A_ (W)w, ++periodiccnt);
1283 array_needsize (periodics, periodicmax, periodiccnt, ); 1364 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1284 periodics [periodiccnt - 1] = w; 1365 periodics [periodiccnt - 1] = w;
1285 upheap ((WT *)periodics, periodiccnt - 1); 1366 upheap ((WT *)periodics, periodiccnt - 1);
1286 1367
1287 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1368 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1288} 1369}
… …
1304 1385
1305 ev_stop (EV_A_ (W)w); 1386 ev_stop (EV_A_ (W)w);
1306} 1387}
1307 1388
1308void 1389void
1390ev_periodic_again (EV_P_ struct ev_periodic *w)
1391{
1392 /* TODO: use adjustheap and recalculation */
1393 ev_periodic_stop (EV_A_ w);
1394 ev_periodic_start (EV_A_ w);
1395}
1396
1397void
1309ev_idle_start (EV_P_ struct ev_idle *w) 1398ev_idle_start (EV_P_ struct ev_idle *w)
1310{ 1399{
1311 if (ev_is_active (w)) 1400 if (ev_is_active (w))
1312 return; 1401 return;
1313 1402
1314 ev_start (EV_A_ (W)w, ++idlecnt); 1403 ev_start (EV_A_ (W)w, ++idlecnt);
1315 array_needsize (idles, idlemax, idlecnt, ); 1404 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1316 idles [idlecnt - 1] = w; 1405 idles [idlecnt - 1] = w;
1317} 1406}
1318 1407
1319void 1408void
1320ev_idle_stop (EV_P_ struct ev_idle *w) 1409ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1332{ 1421{
1333 if (ev_is_active (w)) 1422 if (ev_is_active (w))
1334 return; 1423 return;
1335 1424
1336 ev_start (EV_A_ (W)w, ++preparecnt); 1425 ev_start (EV_A_ (W)w, ++preparecnt);
1337 array_needsize (prepares, preparemax, preparecnt, ); 1426 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1338 prepares [preparecnt - 1] = w; 1427 prepares [preparecnt - 1] = w;
1339} 1428}
1340 1429
1341void 1430void
1342ev_prepare_stop (EV_P_ struct ev_prepare *w) 1431ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1354{ 1443{
1355 if (ev_is_active (w)) 1444 if (ev_is_active (w))
1356 return; 1445 return;
1357 1446
1358 ev_start (EV_A_ (W)w, ++checkcnt); 1447 ev_start (EV_A_ (W)w, ++checkcnt);
1359 array_needsize (checks, checkmax, checkcnt, ); 1448 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1360 checks [checkcnt - 1] = w; 1449 checks [checkcnt - 1] = w;
1361} 1450}
1362 1451
1363void 1452void
1364ev_check_stop (EV_P_ struct ev_check *w) 1453ev_check_stop (EV_P_ struct ev_check *w)
… …
1385 return; 1474 return;
1386 1475
1387 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1476 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1388 1477
1389 ev_start (EV_A_ (W)w, 1); 1478 ev_start (EV_A_ (W)w, 1);
1390 array_needsize (signals, signalmax, w->signum, signals_init); 1479 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1391 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1480 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1392 1481
1393 if (!((WL)w)->next) 1482 if (!((WL)w)->next)
1394 { 1483 {
1395#if WIN32 1484#if WIN32
… …
1478} 1567}
1479 1568
1480void 1569void
1481ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1570ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1482{ 1571{
1483 struct ev_once *once = ev_malloc (sizeof (struct ev_once)); 1572 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1484 1573
1485 if (!once) 1574 if (!once)
1486 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1575 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1487 else 1576 else
1488 { 1577 {
1489 once->cb = cb; 1578 once->cb = cb;
1490 once->arg = arg; 1579 once->arg = arg;
1491 1580
1492 ev_watcher_init (&once->io, once_cb_io); 1581 ev_init (&once->io, once_cb_io);
1493 if (fd >= 0) 1582 if (fd >= 0)
1494 { 1583 {
1495 ev_io_set (&once->io, fd, events); 1584 ev_io_set (&once->io, fd, events);
1496 ev_io_start (EV_A_ &once->io); 1585 ev_io_start (EV_A_ &once->io);
1497 } 1586 }
1498 1587
1499 ev_watcher_init (&once->to, once_cb_to); 1588 ev_init (&once->to, once_cb_to);
1500 if (timeout >= 0.) 1589 if (timeout >= 0.)
1501 { 1590 {
1502 ev_timer_set (&once->to, timeout, 0.); 1591 ev_timer_set (&once->to, timeout, 0.);
1503 ev_timer_start (EV_A_ &once->to); 1592 ev_timer_start (EV_A_ &once->to);
1504 } 1593 }

Diff Legend

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