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

Comparing libev/ev.c (file contents):
Revision 1.54 by root, Sun Nov 4 00:24:16 2007 UTC vs.
Revision 1.69 by root, Tue Nov 6 00:10:04 2007 UTC

… …
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#ifndef EV_STANDALONE 31#ifndef EV_STANDALONE
32# include "config.h" 32# include "config.h"
33
34# if HAVE_CLOCK_GETTIME
35# define EV_USE_MONOTONIC 1
36# define EV_USE_REALTIME 1
37# endif
38
39# if HAVE_SELECT && HAVE_SYS_SELECT_H
40# define EV_USE_SELECT 1
41# endif
42
43# if HAVE_POLL && HAVE_POLL_H
44# define EV_USE_POLL 1
45# endif
46
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1
49# endif
50
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1
53# endif
54
33#endif 55#endif
34 56
35#include <math.h> 57#include <math.h>
36#include <stdlib.h> 58#include <stdlib.h>
37#include <unistd.h> 59#include <unistd.h>
… …
58 80
59#ifndef EV_USE_SELECT 81#ifndef EV_USE_SELECT
60# define EV_USE_SELECT 1 82# define EV_USE_SELECT 1
61#endif 83#endif
62 84
63#ifndef EV_USEV_POLL 85#ifndef EV_USE_POLL
64# define EV_USEV_POLL 0 /* poll is usually slower than select, and not as well tested */ 86# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */
65#endif 87#endif
66 88
67#ifndef EV_USE_EPOLL 89#ifndef EV_USE_EPOLL
68# define EV_USE_EPOLL 0 90# define EV_USE_EPOLL 0
69#endif 91#endif
70 92
71#ifndef EV_USE_KQUEUE 93#ifndef EV_USE_KQUEUE
72# define EV_USE_KQUEUE 0 94# define EV_USE_KQUEUE 0
95#endif
96
97#ifndef EV_USE_WIN32
98# ifdef WIN32
99# define EV_USE_WIN32 1
100# else
101# define EV_USE_WIN32 0
102# endif
73#endif 103#endif
74 104
75#ifndef EV_USE_REALTIME 105#ifndef EV_USE_REALTIME
76# define EV_USE_REALTIME 1 106# define EV_USE_REALTIME 1
77#endif 107#endif
… …
115typedef struct ev_watcher_list *WL; 145typedef struct ev_watcher_list *WL;
116typedef struct ev_watcher_time *WT; 146typedef struct ev_watcher_time *WT;
117 147
118static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
119 149
150#if WIN32
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
120/*****************************************************************************/ 156/*****************************************************************************/
121 157
158static void (*syserr_cb)(void);
159
160void ev_set_syserr_cb (void (*cb)(void))
161{
162 syserr_cb = cb;
163}
164
165static void
166syserr (void)
167{
168 if (syserr_cb)
169 syserr_cb ();
170 else
171 {
172 perror ("libev");
173 abort ();
174 }
175}
176
177static void *(*alloc)(void *ptr, long size);
178
179void ev_set_allocator (void *(*cb)(void *ptr, long size))
180{
181 alloc = cb;
182}
183
184static void *
185ev_realloc (void *ptr, long size)
186{
187 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
188
189 if (!ptr && size)
190 {
191 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
192 abort ();
193 }
194
195 return ptr;
196}
197
198#define ev_malloc(size) ev_realloc (0, (size))
199#define ev_free(ptr) ev_realloc ((ptr), 0)
200
201/*****************************************************************************/
202
122typedef struct 203typedef struct
123{ 204{
124 struct ev_watcher_list *head; 205 WL head;
125 unsigned char events; 206 unsigned char events;
126 unsigned char reify; 207 unsigned char reify;
127} ANFD; 208} ANFD;
128 209
129typedef struct 210typedef struct
130{ 211{
131 W w; 212 W w;
132 int events; 213 int events;
133} ANPENDING; 214} ANPENDING;
134 215
135#ifdef EV_MULTIPLICITY 216#if EV_MULTIPLICITY
136 217
137struct ev_loop 218struct ev_loop
138{ 219{
139# define VAR(name,decl) decl; 220# define VAR(name,decl) decl;
140# include "ev_vars.h" 221# include "ev_vars.h"
… …
187 return rt_now; 268 return rt_now;
188} 269}
189 270
190#define array_roundsize(base,n) ((n) | 4 & ~3) 271#define array_roundsize(base,n) ((n) | 4 & ~3)
191 272
192#define array_needsize(base,cur,cnt,init) \ 273#define array_needsize(base,cur,cnt,init) \
193 if (expect_false ((cnt) > cur)) \ 274 if (expect_false ((cnt) > cur)) \
194 { \ 275 { \
195 int newcnt = cur; \ 276 int newcnt = cur; \
196 do \ 277 do \
197 { \ 278 { \
198 newcnt = array_roundsize (base, newcnt << 1); \ 279 newcnt = array_roundsize (base, newcnt << 1); \
199 } \ 280 } \
200 while ((cnt) > newcnt); \ 281 while ((cnt) > newcnt); \
201 \ 282 \
202 base = realloc (base, sizeof (*base) * (newcnt)); \ 283 base = ev_realloc (base, sizeof (*base) * (newcnt)); \
203 init (base + cur, newcnt - cur); \ 284 init (base + cur, newcnt - cur); \
204 cur = newcnt; \ 285 cur = newcnt; \
205 } 286 }
287
288#define array_slim(stem) \
289 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
290 { \
291 stem ## max = array_roundsize (stem ## cnt >> 1); \
292 base = ev_realloc (base, sizeof (*base) * (stem ## max)); \
293 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
294 }
295
296#define array_free(stem, idx) \
297 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
206 298
207/*****************************************************************************/ 299/*****************************************************************************/
208 300
209static void 301static void
210anfds_init (ANFD *base, int count) 302anfds_init (ANFD *base, int count)
… …
276 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 368 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
277 events |= w->events; 369 events |= w->events;
278 370
279 anfd->reify = 0; 371 anfd->reify = 0;
280 372
281 if (anfd->events != events)
282 {
283 method_modify (EV_A_ fd, anfd->events, events); 373 method_modify (EV_A_ fd, anfd->events, events);
284 anfd->events = events; 374 anfd->events = events;
285 }
286 } 375 }
287 376
288 fdchangecnt = 0; 377 fdchangecnt = 0;
289} 378}
290 379
… …
327 416
328/* called on ENOMEM in select/poll to kill some fds and retry */ 417/* called on ENOMEM in select/poll to kill some fds and retry */
329static void 418static void
330fd_enomem (EV_P) 419fd_enomem (EV_P)
331{ 420{
332 int fd = anfdmax; 421 int fd;
333 422
334 while (fd--) 423 for (fd = anfdmax; fd--; )
335 if (anfds [fd].events) 424 if (anfds [fd].events)
336 { 425 {
337 close (fd);
338 fd_kill (EV_A_ fd); 426 fd_kill (EV_A_ fd);
339 return; 427 return;
340 } 428 }
341} 429}
342 430
431/* susually called after fork if method needs to re-arm all fds from scratch */
432static void
433fd_rearm_all (EV_P)
434{
435 int fd;
436
437 /* this should be highly optimised to not do anything but set a flag */
438 for (fd = 0; fd < anfdmax; ++fd)
439 if (anfds [fd].events)
440 {
441 anfds [fd].events = 0;
442 fd_change (EV_A_ fd);
443 }
444}
445
343/*****************************************************************************/ 446/*****************************************************************************/
344 447
345static void 448static void
346upheap (WT *heap, int k) 449upheap (WT *heap, int k)
347{ 450{
348 WT w = heap [k]; 451 WT w = heap [k];
349 452
350 while (k && heap [k >> 1]->at > w->at) 453 while (k && heap [k >> 1]->at > w->at)
351 { 454 {
352 heap [k] = heap [k >> 1]; 455 heap [k] = heap [k >> 1];
353 heap [k]->active = k + 1; 456 ((W)heap [k])->active = k + 1;
354 k >>= 1; 457 k >>= 1;
355 } 458 }
356 459
357 heap [k] = w; 460 heap [k] = w;
358 heap [k]->active = k + 1; 461 ((W)heap [k])->active = k + 1;
359 462
360} 463}
361 464
362static void 465static void
363downheap (WT *heap, int N, int k) 466downheap (WT *heap, int N, int k)
… …
373 476
374 if (w->at <= heap [j]->at) 477 if (w->at <= heap [j]->at)
375 break; 478 break;
376 479
377 heap [k] = heap [j]; 480 heap [k] = heap [j];
378 heap [k]->active = k + 1; 481 ((W)heap [k])->active = k + 1;
379 k = j; 482 k = j;
380 } 483 }
381 484
382 heap [k] = w; 485 heap [k] = w;
383 heap [k]->active = k + 1; 486 ((W)heap [k])->active = k + 1;
384} 487}
385 488
386/*****************************************************************************/ 489/*****************************************************************************/
387 490
388typedef struct 491typedef struct
389{ 492{
390 struct ev_watcher_list *head; 493 WL head;
391 sig_atomic_t volatile gotsig; 494 sig_atomic_t volatile gotsig;
392} ANSIG; 495} ANSIG;
393 496
394static ANSIG *signals; 497static ANSIG *signals;
395static int signalmax; 498static int signalmax;
396 499
397static int sigpipe [2]; 500static int sigpipe [2];
398static sig_atomic_t volatile gotsig; 501static sig_atomic_t volatile gotsig;
502static struct ev_io sigev;
399 503
400static void 504static void
401signals_init (ANSIG *base, int count) 505signals_init (ANSIG *base, int count)
402{ 506{
403 while (count--) 507 while (count--)
… …
410} 514}
411 515
412static void 516static void
413sighandler (int signum) 517sighandler (int signum)
414{ 518{
519#if WIN32
520 signal (signum, sighandler);
521#endif
522
415 signals [signum - 1].gotsig = 1; 523 signals [signum - 1].gotsig = 1;
416 524
417 if (!gotsig) 525 if (!gotsig)
418 { 526 {
419 int old_errno = errno; 527 int old_errno = errno;
… …
424} 532}
425 533
426static void 534static void
427sigcb (EV_P_ struct ev_io *iow, int revents) 535sigcb (EV_P_ struct ev_io *iow, int revents)
428{ 536{
429 struct ev_watcher_list *w; 537 WL w;
430 int signum; 538 int signum;
431 539
432 read (sigpipe [0], &revents, 1); 540 read (sigpipe [0], &revents, 1);
433 gotsig = 0; 541 gotsig = 0;
434 542
… …
461 569
462/*****************************************************************************/ 570/*****************************************************************************/
463 571
464#ifndef WIN32 572#ifndef WIN32
465 573
574static struct ev_child *childs [PID_HASHSIZE];
575static struct ev_signal childev;
576
466#ifndef WCONTINUED 577#ifndef WCONTINUED
467# define WCONTINUED 0 578# define WCONTINUED 0
468#endif 579#endif
469 580
470static void 581static void
… …
473 struct ev_child *w; 584 struct ev_child *w;
474 585
475 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 586 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
476 if (w->pid == pid || !w->pid) 587 if (w->pid == pid || !w->pid)
477 { 588 {
478 w->priority = sw->priority; /* need to do it *now* */ 589 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
479 w->rpid = pid; 590 w->rpid = pid;
480 w->rstatus = status; 591 w->rstatus = status;
481 event (EV_A_ (W)w, EV_CHILD); 592 event (EV_A_ (W)w, EV_CHILD);
482 } 593 }
483} 594}
484 595
485static void 596static void
… …
505# include "ev_kqueue.c" 616# include "ev_kqueue.c"
506#endif 617#endif
507#if EV_USE_EPOLL 618#if EV_USE_EPOLL
508# include "ev_epoll.c" 619# include "ev_epoll.c"
509#endif 620#endif
510#if EV_USEV_POLL 621#if EV_USE_POLL
511# include "ev_poll.c" 622# include "ev_poll.c"
512#endif 623#endif
513#if EV_USE_SELECT 624#if EV_USE_SELECT
514# include "ev_select.c" 625# include "ev_select.c"
515#endif 626#endif
… …
560 rt_now = ev_time (); 671 rt_now = ev_time ();
561 mn_now = get_clock (); 672 mn_now = get_clock ();
562 now_floor = mn_now; 673 now_floor = mn_now;
563 rtmn_diff = rt_now - mn_now; 674 rtmn_diff = rt_now - mn_now;
564 675
565 if (pipe (sigpipe))
566 return 0;
567
568 if (methods == EVMETHOD_AUTO) 676 if (methods == EVMETHOD_AUTO)
569 if (!enable_secure () && getenv ("LIBmethodS")) 677 if (!enable_secure () && getenv ("LIBEV_METHODS"))
570 methods = atoi (getenv ("LIBmethodS")); 678 methods = atoi (getenv ("LIBEV_METHODS"));
571 else 679 else
572 methods = EVMETHOD_ANY; 680 methods = EVMETHOD_ANY;
573 681
574 method = 0; 682 method = 0;
683#if EV_USE_WIN32
684 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
685#endif
575#if EV_USE_KQUEUE 686#if EV_USE_KQUEUE
576 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 687 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
577#endif 688#endif
578#if EV_USE_EPOLL 689#if EV_USE_EPOLL
579 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 690 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
580#endif 691#endif
581#if EV_USEV_POLL 692#if EV_USE_POLL
582 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 693 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
583#endif 694#endif
584#if EV_USE_SELECT 695#if EV_USE_SELECT
585 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 696 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
586#endif 697#endif
698 }
699}
587 700
701void
702loop_destroy (EV_P)
703{
704 int i;
705
706#if EV_USE_WIN32
707 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
708#endif
709#if EV_USE_KQUEUE
710 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
711#endif
712#if EV_USE_EPOLL
713 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
714#endif
715#if EV_USE_POLL
716 if (method == EVMETHOD_POLL ) poll_destroy (EV_A);
717#endif
718#if EV_USE_SELECT
719 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
720#endif
721
722 for (i = NUMPRI; i--; )
723 array_free (pending, [i]);
724
725 array_free (fdchange, );
726 array_free (timer, );
727 array_free (periodic, );
728 array_free (idle, );
729 array_free (prepare, );
730 array_free (check, );
731
732 method = 0;
733 /*TODO*/
734}
735
736void
737loop_fork (EV_P)
738{
739 /*TODO*/
740#if EV_USE_EPOLL
741 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
742#endif
743#if EV_USE_KQUEUE
744 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
745#endif
746}
747
748#if EV_MULTIPLICITY
749struct ev_loop *
750ev_loop_new (int methods)
751{
752 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
753
754 memset (loop, 0, sizeof (struct ev_loop));
755
756 loop_init (EV_A_ methods);
757
758 if (ev_method (EV_A))
759 return loop;
760
761 return 0;
762}
763
764void
765ev_loop_destroy (EV_P)
766{
767 loop_destroy (EV_A);
768 ev_free (loop);
769}
770
771void
772ev_loop_fork (EV_P)
773{
774 loop_fork (EV_A);
775}
776
777#endif
778
779#if EV_MULTIPLICITY
780struct ev_loop default_loop_struct;
781static struct ev_loop *default_loop;
782
783struct ev_loop *
784#else
785static int default_loop;
786
787int
788#endif
789ev_default_loop (int methods)
790{
791 if (sigpipe [0] == sigpipe [1])
792 if (pipe (sigpipe))
793 return 0;
794
795 if (!default_loop)
796 {
797#if EV_MULTIPLICITY
798 struct ev_loop *loop = default_loop = &default_loop_struct;
799#else
800 default_loop = 1;
801#endif
802
803 loop_init (EV_A_ methods);
804
588 if (method) 805 if (ev_method (EV_A))
589 { 806 {
590 ev_watcher_init (&sigev, sigcb); 807 ev_watcher_init (&sigev, sigcb);
591 ev_set_priority (&sigev, EV_MAXPRI); 808 ev_set_priority (&sigev, EV_MAXPRI);
592 siginit (EV_A); 809 siginit (EV_A);
593 810
… …
596 ev_set_priority (&childev, EV_MAXPRI); 813 ev_set_priority (&childev, EV_MAXPRI);
597 ev_signal_start (EV_A_ &childev); 814 ev_signal_start (EV_A_ &childev);
598 ev_unref (EV_A); /* child watcher should not keep loop alive */ 815 ev_unref (EV_A); /* child watcher should not keep loop alive */
599#endif 816#endif
600 } 817 }
818 else
819 default_loop = 0;
601 } 820 }
602 821
603 return method;
604}
605
606#ifdef EV_MULTIPLICITY
607
608struct ev_loop *
609ev_loop_new (int methods)
610{
611 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop));
612
613 loop_init (EV_A_ methods);
614
615 return loop; 822 return default_loop;
616} 823}
617 824
618void 825void
619ev_loop_delete (EV_P) 826ev_default_destroy (void)
620{ 827{
621 /*TODO*/
622 free (loop);
623}
624
625#else
626
627int
628ev_init (int methods)
629{
630 loop_init ();
631}
632
633#endif
634
635/*****************************************************************************/
636
637void
638ev_fork_prepare (void)
639{
640 /* nop */
641}
642
643void
644ev_fork_parent (void)
645{
646 /* nop */
647}
648
649void
650ev_fork_child (void)
651{
652 /*TODO*/
653#if !EV_MULTIPLICITY 828#if EV_MULTIPLICITY
654#if EV_USE_EPOLL 829 struct ev_loop *loop = default_loop;
655 if (method == EVMETHOD_EPOLL)
656 epoll_postfork_child (EV_A);
657#endif 830#endif
831
832 ev_ref (EV_A); /* child watcher */
833 ev_signal_stop (EV_A_ &childev);
834
835 ev_ref (EV_A); /* signal watcher */
836 ev_io_stop (EV_A_ &sigev);
837
838 close (sigpipe [0]); sigpipe [0] = 0;
839 close (sigpipe [1]); sigpipe [1] = 0;
840
841 loop_destroy (EV_A);
842}
843
844void
845ev_default_fork (void)
846{
847#if EV_MULTIPLICITY
848 struct ev_loop *loop = default_loop;
849#endif
850
851 loop_fork (EV_A);
658 852
659 ev_io_stop (EV_A_ &sigev); 853 ev_io_stop (EV_A_ &sigev);
660 close (sigpipe [0]); 854 close (sigpipe [0]);
661 close (sigpipe [1]); 855 close (sigpipe [1]);
662 pipe (sigpipe); 856 pipe (sigpipe);
857
858 ev_ref (EV_A); /* signal watcher */
663 siginit (EV_A); 859 siginit (EV_A);
664#endif
665} 860}
666 861
667/*****************************************************************************/ 862/*****************************************************************************/
668 863
669static void 864static void
… …
685} 880}
686 881
687static void 882static void
688timers_reify (EV_P) 883timers_reify (EV_P)
689{ 884{
690 while (timercnt && timers [0]->at <= mn_now) 885 while (timercnt && ((WT)timers [0])->at <= mn_now)
691 { 886 {
692 struct ev_timer *w = timers [0]; 887 struct ev_timer *w = timers [0];
888
889 assert (("inactive timer on timer heap detected", ev_is_active (w)));
693 890
694 /* first reschedule or stop timer */ 891 /* first reschedule or stop timer */
695 if (w->repeat) 892 if (w->repeat)
696 { 893 {
697 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 894 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
698 w->at = mn_now + w->repeat; 895 ((WT)w)->at = mn_now + w->repeat;
699 downheap ((WT *)timers, timercnt, 0); 896 downheap ((WT *)timers, timercnt, 0);
700 } 897 }
701 else 898 else
702 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 899 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
703 900
… …
706} 903}
707 904
708static void 905static void
709periodics_reify (EV_P) 906periodics_reify (EV_P)
710{ 907{
711 while (periodiccnt && periodics [0]->at <= rt_now) 908 while (periodiccnt && ((WT)periodics [0])->at <= rt_now)
712 { 909 {
713 struct ev_periodic *w = periodics [0]; 910 struct ev_periodic *w = periodics [0];
911
912 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
714 913
715 /* first reschedule or stop timer */ 914 /* first reschedule or stop timer */
716 if (w->interval) 915 if (w->interval)
717 { 916 {
718 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval; 917 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
719 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now)); 918 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
720 downheap ((WT *)periodics, periodiccnt, 0); 919 downheap ((WT *)periodics, periodiccnt, 0);
721 } 920 }
722 else 921 else
723 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 922 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
724 923
… …
736 { 935 {
737 struct ev_periodic *w = periodics [i]; 936 struct ev_periodic *w = periodics [i];
738 937
739 if (w->interval) 938 if (w->interval)
740 { 939 {
741 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval; 940 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
742 941
743 if (fabs (diff) >= 1e-4) 942 if (fabs (diff) >= 1e-4)
744 { 943 {
745 ev_periodic_stop (EV_A_ w); 944 ev_periodic_stop (EV_A_ w);
746 ev_periodic_start (EV_A_ w); 945 ev_periodic_start (EV_A_ w);
… …
807 { 1006 {
808 periodics_reschedule (EV_A); 1007 periodics_reschedule (EV_A);
809 1008
810 /* adjust timers. this is easy, as the offset is the same for all */ 1009 /* adjust timers. this is easy, as the offset is the same for all */
811 for (i = 0; i < timercnt; ++i) 1010 for (i = 0; i < timercnt; ++i)
812 timers [i]->at += rt_now - mn_now; 1011 ((WT)timers [i])->at += rt_now - mn_now;
813 } 1012 }
814 1013
815 mn_now = rt_now; 1014 mn_now = rt_now;
816 } 1015 }
817} 1016}
… …
868 { 1067 {
869 block = MAX_BLOCKTIME; 1068 block = MAX_BLOCKTIME;
870 1069
871 if (timercnt) 1070 if (timercnt)
872 { 1071 {
873 ev_tstamp to = timers [0]->at - mn_now + method_fudge; 1072 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
874 if (block > to) block = to; 1073 if (block > to) block = to;
875 } 1074 }
876 1075
877 if (periodiccnt) 1076 if (periodiccnt)
878 { 1077 {
879 ev_tstamp to = periodics [0]->at - rt_now + method_fudge; 1078 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge;
880 if (block > to) block = to; 1079 if (block > to) block = to;
881 } 1080 }
882 1081
883 if (block < 0.) block = 0.; 1082 if (block < 0.) block = 0.;
884 } 1083 }
… …
1001ev_timer_start (EV_P_ struct ev_timer *w) 1200ev_timer_start (EV_P_ struct ev_timer *w)
1002{ 1201{
1003 if (ev_is_active (w)) 1202 if (ev_is_active (w))
1004 return; 1203 return;
1005 1204
1006 w->at += mn_now; 1205 ((WT)w)->at += mn_now;
1007 1206
1008 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1207 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1009 1208
1010 ev_start (EV_A_ (W)w, ++timercnt); 1209 ev_start (EV_A_ (W)w, ++timercnt);
1011 array_needsize (timers, timermax, timercnt, ); 1210 array_needsize (timers, timermax, timercnt, );
1012 timers [timercnt - 1] = w; 1211 timers [timercnt - 1] = w;
1013 upheap ((WT *)timers, timercnt - 1); 1212 upheap ((WT *)timers, timercnt - 1);
1213
1214 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1014} 1215}
1015 1216
1016void 1217void
1017ev_timer_stop (EV_P_ struct ev_timer *w) 1218ev_timer_stop (EV_P_ struct ev_timer *w)
1018{ 1219{
1019 ev_clear_pending (EV_A_ (W)w); 1220 ev_clear_pending (EV_A_ (W)w);
1020 if (!ev_is_active (w)) 1221 if (!ev_is_active (w))
1021 return; 1222 return;
1022 1223
1224 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1225
1023 if (w->active < timercnt--) 1226 if (((W)w)->active < timercnt--)
1024 { 1227 {
1025 timers [w->active - 1] = timers [timercnt]; 1228 timers [((W)w)->active - 1] = timers [timercnt];
1026 downheap ((WT *)timers, timercnt, w->active - 1); 1229 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1027 } 1230 }
1028 1231
1029 w->at = w->repeat; 1232 ((WT)w)->at = w->repeat;
1030 1233
1031 ev_stop (EV_A_ (W)w); 1234 ev_stop (EV_A_ (W)w);
1032} 1235}
1033 1236
1034void 1237void
… …
1036{ 1239{
1037 if (ev_is_active (w)) 1240 if (ev_is_active (w))
1038 { 1241 {
1039 if (w->repeat) 1242 if (w->repeat)
1040 { 1243 {
1041 w->at = mn_now + w->repeat; 1244 ((WT)w)->at = mn_now + w->repeat;
1042 downheap ((WT *)timers, timercnt, w->active - 1); 1245 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1043 } 1246 }
1044 else 1247 else
1045 ev_timer_stop (EV_A_ w); 1248 ev_timer_stop (EV_A_ w);
1046 } 1249 }
1047 else if (w->repeat) 1250 else if (w->repeat)
… …
1056 1259
1057 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1260 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1058 1261
1059 /* this formula differs from the one in periodic_reify because we do not always round up */ 1262 /* this formula differs from the one in periodic_reify because we do not always round up */
1060 if (w->interval) 1263 if (w->interval)
1061 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval; 1264 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1062 1265
1063 ev_start (EV_A_ (W)w, ++periodiccnt); 1266 ev_start (EV_A_ (W)w, ++periodiccnt);
1064 array_needsize (periodics, periodicmax, periodiccnt, ); 1267 array_needsize (periodics, periodicmax, periodiccnt, );
1065 periodics [periodiccnt - 1] = w; 1268 periodics [periodiccnt - 1] = w;
1066 upheap ((WT *)periodics, periodiccnt - 1); 1269 upheap ((WT *)periodics, periodiccnt - 1);
1270
1271 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1067} 1272}
1068 1273
1069void 1274void
1070ev_periodic_stop (EV_P_ struct ev_periodic *w) 1275ev_periodic_stop (EV_P_ struct ev_periodic *w)
1071{ 1276{
1072 ev_clear_pending (EV_A_ (W)w); 1277 ev_clear_pending (EV_A_ (W)w);
1073 if (!ev_is_active (w)) 1278 if (!ev_is_active (w))
1074 return; 1279 return;
1075 1280
1281 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1282
1076 if (w->active < periodiccnt--) 1283 if (((W)w)->active < periodiccnt--)
1077 { 1284 {
1078 periodics [w->active - 1] = periodics [periodiccnt]; 1285 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1079 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1286 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1080 } 1287 }
1081 1288
1289 ev_stop (EV_A_ (W)w);
1290}
1291
1292void
1293ev_idle_start (EV_P_ struct ev_idle *w)
1294{
1295 if (ev_is_active (w))
1296 return;
1297
1298 ev_start (EV_A_ (W)w, ++idlecnt);
1299 array_needsize (idles, idlemax, idlecnt, );
1300 idles [idlecnt - 1] = w;
1301}
1302
1303void
1304ev_idle_stop (EV_P_ struct ev_idle *w)
1305{
1306 ev_clear_pending (EV_A_ (W)w);
1307 if (ev_is_active (w))
1308 return;
1309
1310 idles [((W)w)->active - 1] = idles [--idlecnt];
1311 ev_stop (EV_A_ (W)w);
1312}
1313
1314void
1315ev_prepare_start (EV_P_ struct ev_prepare *w)
1316{
1317 if (ev_is_active (w))
1318 return;
1319
1320 ev_start (EV_A_ (W)w, ++preparecnt);
1321 array_needsize (prepares, preparemax, preparecnt, );
1322 prepares [preparecnt - 1] = w;
1323}
1324
1325void
1326ev_prepare_stop (EV_P_ struct ev_prepare *w)
1327{
1328 ev_clear_pending (EV_A_ (W)w);
1329 if (ev_is_active (w))
1330 return;
1331
1332 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1333 ev_stop (EV_A_ (W)w);
1334}
1335
1336void
1337ev_check_start (EV_P_ struct ev_check *w)
1338{
1339 if (ev_is_active (w))
1340 return;
1341
1342 ev_start (EV_A_ (W)w, ++checkcnt);
1343 array_needsize (checks, checkmax, checkcnt, );
1344 checks [checkcnt - 1] = w;
1345}
1346
1347void
1348ev_check_stop (EV_P_ struct ev_check *w)
1349{
1350 ev_clear_pending (EV_A_ (W)w);
1351 if (ev_is_active (w))
1352 return;
1353
1354 checks [((W)w)->active - 1] = checks [--checkcnt];
1082 ev_stop (EV_A_ (W)w); 1355 ev_stop (EV_A_ (W)w);
1083} 1356}
1084 1357
1085#ifndef SA_RESTART 1358#ifndef SA_RESTART
1086# define SA_RESTART 0 1359# define SA_RESTART 0
1087#endif 1360#endif
1088 1361
1089void 1362void
1090ev_signal_start (EV_P_ struct ev_signal *w) 1363ev_signal_start (EV_P_ struct ev_signal *w)
1091{ 1364{
1365#if EV_MULTIPLICITY
1366 assert (("signal watchers are only supported in the default loop", loop == default_loop));
1367#endif
1092 if (ev_is_active (w)) 1368 if (ev_is_active (w))
1093 return; 1369 return;
1094 1370
1095 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1371 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1096 1372
1097 ev_start (EV_A_ (W)w, 1); 1373 ev_start (EV_A_ (W)w, 1);
1098 array_needsize (signals, signalmax, w->signum, signals_init); 1374 array_needsize (signals, signalmax, w->signum, signals_init);
1099 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1375 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1100 1376
1101 if (!w->next) 1377 if (!((WL)w)->next)
1102 { 1378 {
1379#if WIN32
1380 signal (w->signum, sighandler);
1381#else
1103 struct sigaction sa; 1382 struct sigaction sa;
1104 sa.sa_handler = sighandler; 1383 sa.sa_handler = sighandler;
1105 sigfillset (&sa.sa_mask); 1384 sigfillset (&sa.sa_mask);
1106 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1385 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1107 sigaction (w->signum, &sa, 0); 1386 sigaction (w->signum, &sa, 0);
1387#endif
1108 } 1388 }
1109} 1389}
1110 1390
1111void 1391void
1112ev_signal_stop (EV_P_ struct ev_signal *w) 1392ev_signal_stop (EV_P_ struct ev_signal *w)
… …
1121 if (!signals [w->signum - 1].head) 1401 if (!signals [w->signum - 1].head)
1122 signal (w->signum, SIG_DFL); 1402 signal (w->signum, SIG_DFL);
1123} 1403}
1124 1404
1125void 1405void
1126ev_idle_start (EV_P_ struct ev_idle *w)
1127{
1128 if (ev_is_active (w))
1129 return;
1130
1131 ev_start (EV_A_ (W)w, ++idlecnt);
1132 array_needsize (idles, idlemax, idlecnt, );
1133 idles [idlecnt - 1] = w;
1134}
1135
1136void
1137ev_idle_stop (EV_P_ struct ev_idle *w)
1138{
1139 ev_clear_pending (EV_A_ (W)w);
1140 if (ev_is_active (w))
1141 return;
1142
1143 idles [w->active - 1] = idles [--idlecnt];
1144 ev_stop (EV_A_ (W)w);
1145}
1146
1147void
1148ev_prepare_start (EV_P_ struct ev_prepare *w)
1149{
1150 if (ev_is_active (w))
1151 return;
1152
1153 ev_start (EV_A_ (W)w, ++preparecnt);
1154 array_needsize (prepares, preparemax, preparecnt, );
1155 prepares [preparecnt - 1] = w;
1156}
1157
1158void
1159ev_prepare_stop (EV_P_ struct ev_prepare *w)
1160{
1161 ev_clear_pending (EV_A_ (W)w);
1162 if (ev_is_active (w))
1163 return;
1164
1165 prepares [w->active - 1] = prepares [--preparecnt];
1166 ev_stop (EV_A_ (W)w);
1167}
1168
1169void
1170ev_check_start (EV_P_ struct ev_check *w)
1171{
1172 if (ev_is_active (w))
1173 return;
1174
1175 ev_start (EV_A_ (W)w, ++checkcnt);
1176 array_needsize (checks, checkmax, checkcnt, );
1177 checks [checkcnt - 1] = w;
1178}
1179
1180void
1181ev_check_stop (EV_P_ struct ev_check *w)
1182{
1183 ev_clear_pending (EV_A_ (W)w);
1184 if (ev_is_active (w))
1185 return;
1186
1187 checks [w->active - 1] = checks [--checkcnt];
1188 ev_stop (EV_A_ (W)w);
1189}
1190
1191void
1192ev_child_start (EV_P_ struct ev_child *w) 1406ev_child_start (EV_P_ struct ev_child *w)
1193{ 1407{
1408#if EV_MULTIPLICITY
1409 assert (("child watchers are only supported in the default loop", loop == default_loop));
1410#endif
1194 if (ev_is_active (w)) 1411 if (ev_is_active (w))
1195 return; 1412 return;
1196 1413
1197 ev_start (EV_A_ (W)w, 1); 1414 ev_start (EV_A_ (W)w, 1);
1198 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1415 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
… …
1225 void (*cb)(int revents, void *arg) = once->cb; 1442 void (*cb)(int revents, void *arg) = once->cb;
1226 void *arg = once->arg; 1443 void *arg = once->arg;
1227 1444
1228 ev_io_stop (EV_A_ &once->io); 1445 ev_io_stop (EV_A_ &once->io);
1229 ev_timer_stop (EV_A_ &once->to); 1446 ev_timer_stop (EV_A_ &once->to);
1230 free (once); 1447 ev_free (once);
1231 1448
1232 cb (revents, arg); 1449 cb (revents, arg);
1233} 1450}
1234 1451
1235static void 1452static void
… …
1245} 1462}
1246 1463
1247void 1464void
1248ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1465ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1249{ 1466{
1250 struct ev_once *once = malloc (sizeof (struct ev_once)); 1467 struct ev_once *once = ev_malloc (sizeof (struct ev_once));
1251 1468
1252 if (!once) 1469 if (!once)
1253 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1470 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1254 else 1471 else
1255 { 1472 {
… …
1270 ev_timer_start (EV_A_ &once->to); 1487 ev_timer_start (EV_A_ &once->to);
1271 } 1488 }
1272 } 1489 }
1273} 1490}
1274 1491
1275/*****************************************************************************/
1276
1277#if 0
1278
1279struct ev_io wio;
1280
1281static void
1282sin_cb (struct ev_io *w, int revents)
1283{
1284 fprintf (stderr, "sin %d, revents %d\n", w->fd, revents);
1285}
1286
1287static void
1288ocb (struct ev_timer *w, int revents)
1289{
1290 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);
1291 ev_timer_stop (w);
1292 ev_timer_start (w);
1293}
1294
1295static void
1296scb (struct ev_signal *w, int revents)
1297{
1298 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
1299 ev_io_stop (&wio);
1300 ev_io_start (&wio);
1301}
1302
1303static void
1304gcb (struct ev_signal *w, int revents)
1305{
1306 fprintf (stderr, "generic %x\n", revents);
1307
1308}
1309
1310int main (void)
1311{
1312 ev_init (0);
1313
1314 ev_io_init (&wio, sin_cb, 0, EV_READ);
1315 ev_io_start (&wio);
1316
1317 struct ev_timer t[10000];
1318
1319#if 0
1320 int i;
1321 for (i = 0; i < 10000; ++i)
1322 {
1323 struct ev_timer *w = t + i;
1324 ev_watcher_init (w, ocb, i);
1325 ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
1326 ev_timer_start (w);
1327 if (drand48 () < 0.5)
1328 ev_timer_stop (w);
1329 }
1330#endif
1331
1332 struct ev_timer t1;
1333 ev_timer_init (&t1, ocb, 5, 10);
1334 ev_timer_start (&t1);
1335
1336 struct ev_signal sig;
1337 ev_signal_init (&sig, scb, SIGQUIT);
1338 ev_signal_start (&sig);
1339
1340 struct ev_check cw;
1341 ev_check_init (&cw, gcb);
1342 ev_check_start (&cw);
1343
1344 struct ev_idle iw;
1345 ev_idle_init (&iw, gcb);
1346 ev_idle_start (&iw);
1347
1348 ev_loop (0);
1349
1350 return 0;
1351}
1352
1353#endif
1354
1355
1356
1357

Diff Legend

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