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

Comparing libev/ev.c (file contents):
Revision 1.57 by root, Sun Nov 4 16:43:53 2007 UTC vs.
Revision 1.68 by root, Mon Nov 5 20:19:00 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
122typedef struct 158typedef struct
123{ 159{
124 struct ev_watcher_list *head; 160 WL head;
125 unsigned char events; 161 unsigned char events;
126 unsigned char reify; 162 unsigned char reify;
127} ANFD; 163} ANFD;
128 164
129typedef struct 165typedef struct
… …
202 base = realloc (base, sizeof (*base) * (newcnt)); \ 238 base = realloc (base, sizeof (*base) * (newcnt)); \
203 init (base + cur, newcnt - cur); \ 239 init (base + cur, newcnt - cur); \
204 cur = newcnt; \ 240 cur = newcnt; \
205 } 241 }
206 242
243#define array_slim(stem) \
244 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
245 { \
246 stem ## max = array_roundsize (stem ## cnt >> 1); \
247 base = realloc (base, sizeof (*base) * (stem ## max)); \
248 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
249 }
250
251#define array_free(stem, idx) \
252 free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
253
207/*****************************************************************************/ 254/*****************************************************************************/
208 255
209static void 256static void
210anfds_init (ANFD *base, int count) 257anfds_init (ANFD *base, int count)
211{ 258{
… …
276 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 323 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
277 events |= w->events; 324 events |= w->events;
278 325
279 anfd->reify = 0; 326 anfd->reify = 0;
280 327
281 if (anfd->events != events)
282 {
283 method_modify (EV_A_ fd, anfd->events, events); 328 method_modify (EV_A_ fd, anfd->events, events);
284 anfd->events = events; 329 anfd->events = events;
285 }
286 } 330 }
287 331
288 fdchangecnt = 0; 332 fdchangecnt = 0;
289} 333}
290 334
… …
327 371
328/* called on ENOMEM in select/poll to kill some fds and retry */ 372/* called on ENOMEM in select/poll to kill some fds and retry */
329static void 373static void
330fd_enomem (EV_P) 374fd_enomem (EV_P)
331{ 375{
332 int fd = anfdmax; 376 int fd;
333 377
334 while (fd--) 378 for (fd = anfdmax; fd--; )
335 if (anfds [fd].events) 379 if (anfds [fd].events)
336 { 380 {
337 close (fd);
338 fd_kill (EV_A_ fd); 381 fd_kill (EV_A_ fd);
339 return; 382 return;
340 } 383 }
341} 384}
342 385
… …
349 /* this should be highly optimised to not do anything but set a flag */ 392 /* this should be highly optimised to not do anything but set a flag */
350 for (fd = 0; fd < anfdmax; ++fd) 393 for (fd = 0; fd < anfdmax; ++fd)
351 if (anfds [fd].events) 394 if (anfds [fd].events)
352 { 395 {
353 anfds [fd].events = 0; 396 anfds [fd].events = 0;
354 fd_change (fd); 397 fd_change (EV_A_ fd);
355 } 398 }
356} 399}
357 400
358/*****************************************************************************/ 401/*****************************************************************************/
359 402
… …
363 WT w = heap [k]; 406 WT w = heap [k];
364 407
365 while (k && heap [k >> 1]->at > w->at) 408 while (k && heap [k >> 1]->at > w->at)
366 { 409 {
367 heap [k] = heap [k >> 1]; 410 heap [k] = heap [k >> 1];
368 heap [k]->active = k + 1; 411 ((W)heap [k])->active = k + 1;
369 k >>= 1; 412 k >>= 1;
370 } 413 }
371 414
372 heap [k] = w; 415 heap [k] = w;
373 heap [k]->active = k + 1; 416 ((W)heap [k])->active = k + 1;
374 417
375} 418}
376 419
377static void 420static void
378downheap (WT *heap, int N, int k) 421downheap (WT *heap, int N, int k)
… …
388 431
389 if (w->at <= heap [j]->at) 432 if (w->at <= heap [j]->at)
390 break; 433 break;
391 434
392 heap [k] = heap [j]; 435 heap [k] = heap [j];
393 heap [k]->active = k + 1; 436 ((W)heap [k])->active = k + 1;
394 k = j; 437 k = j;
395 } 438 }
396 439
397 heap [k] = w; 440 heap [k] = w;
398 heap [k]->active = k + 1; 441 ((W)heap [k])->active = k + 1;
399} 442}
400 443
401/*****************************************************************************/ 444/*****************************************************************************/
402 445
403typedef struct 446typedef struct
404{ 447{
405 struct ev_watcher_list *head; 448 WL head;
406 sig_atomic_t volatile gotsig; 449 sig_atomic_t volatile gotsig;
407} ANSIG; 450} ANSIG;
408 451
409static ANSIG *signals; 452static ANSIG *signals;
410static int signalmax; 453static int signalmax;
411 454
412static int sigpipe [2]; 455static int sigpipe [2];
413static sig_atomic_t volatile gotsig; 456static sig_atomic_t volatile gotsig;
457static struct ev_io sigev;
414 458
415static void 459static void
416signals_init (ANSIG *base, int count) 460signals_init (ANSIG *base, int count)
417{ 461{
418 while (count--) 462 while (count--)
… …
425} 469}
426 470
427static void 471static void
428sighandler (int signum) 472sighandler (int signum)
429{ 473{
474#if WIN32
475 signal (signum, sighandler);
476#endif
477
430 signals [signum - 1].gotsig = 1; 478 signals [signum - 1].gotsig = 1;
431 479
432 if (!gotsig) 480 if (!gotsig)
433 { 481 {
434 int old_errno = errno; 482 int old_errno = errno;
… …
439} 487}
440 488
441static void 489static void
442sigcb (EV_P_ struct ev_io *iow, int revents) 490sigcb (EV_P_ struct ev_io *iow, int revents)
443{ 491{
444 struct ev_watcher_list *w; 492 WL w;
445 int signum; 493 int signum;
446 494
447 read (sigpipe [0], &revents, 1); 495 read (sigpipe [0], &revents, 1);
448 gotsig = 0; 496 gotsig = 0;
449 497
… …
476 524
477/*****************************************************************************/ 525/*****************************************************************************/
478 526
479#ifndef WIN32 527#ifndef WIN32
480 528
529static struct ev_child *childs [PID_HASHSIZE];
530static struct ev_signal childev;
531
481#ifndef WCONTINUED 532#ifndef WCONTINUED
482# define WCONTINUED 0 533# define WCONTINUED 0
483#endif 534#endif
484 535
485static void 536static void
… …
488 struct ev_child *w; 539 struct ev_child *w;
489 540
490 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 541 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
491 if (w->pid == pid || !w->pid) 542 if (w->pid == pid || !w->pid)
492 { 543 {
493 w->priority = sw->priority; /* need to do it *now* */ 544 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
494 w->rpid = pid; 545 w->rpid = pid;
495 w->rstatus = status; 546 w->rstatus = status;
496 event (EV_A_ (W)w, EV_CHILD); 547 event (EV_A_ (W)w, EV_CHILD);
497 } 548 }
498} 549}
499 550
500static void 551static void
… …
520# include "ev_kqueue.c" 571# include "ev_kqueue.c"
521#endif 572#endif
522#if EV_USE_EPOLL 573#if EV_USE_EPOLL
523# include "ev_epoll.c" 574# include "ev_epoll.c"
524#endif 575#endif
525#if EV_USEV_POLL 576#if EV_USE_POLL
526# include "ev_poll.c" 577# include "ev_poll.c"
527#endif 578#endif
528#if EV_USE_SELECT 579#if EV_USE_SELECT
529# include "ev_select.c" 580# include "ev_select.c"
530#endif 581#endif
… …
582 methods = atoi (getenv ("LIBEV_METHODS")); 633 methods = atoi (getenv ("LIBEV_METHODS"));
583 else 634 else
584 methods = EVMETHOD_ANY; 635 methods = EVMETHOD_ANY;
585 636
586 method = 0; 637 method = 0;
638#if EV_USE_WIN32
639 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
640#endif
587#if EV_USE_KQUEUE 641#if EV_USE_KQUEUE
588 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 642 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
589#endif 643#endif
590#if EV_USE_EPOLL 644#if EV_USE_EPOLL
591 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 645 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
592#endif 646#endif
593#if EV_USEV_POLL 647#if EV_USE_POLL
594 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 648 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
595#endif 649#endif
596#if EV_USE_SELECT 650#if EV_USE_SELECT
597 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 651 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
598#endif 652#endif
… …
600} 654}
601 655
602void 656void
603loop_destroy (EV_P) 657loop_destroy (EV_P)
604{ 658{
659 int i;
660
661#if EV_USE_WIN32
662 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
663#endif
605#if EV_USE_KQUEUE 664#if EV_USE_KQUEUE
606 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 665 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
607#endif 666#endif
608#if EV_USE_EPOLL 667#if EV_USE_EPOLL
609 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 668 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
610#endif 669#endif
611#if EV_USEV_POLL 670#if EV_USE_POLL
612 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 671 if (method == EVMETHOD_POLL ) poll_destroy (EV_A);
613#endif 672#endif
614#if EV_USE_SELECT 673#if EV_USE_SELECT
615 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 674 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
616#endif 675#endif
676
677 for (i = NUMPRI; i--; )
678 array_free (pending, [i]);
679
680 array_free (fdchange, );
681 array_free (timer, );
682 array_free (periodic, );
683 array_free (idle, );
684 array_free (prepare, );
685 array_free (check, );
617 686
618 method = 0; 687 method = 0;
619 /*TODO*/ 688 /*TODO*/
620} 689}
621 690
… …
637{ 706{
638 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 707 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop));
639 708
640 loop_init (EV_A_ methods); 709 loop_init (EV_A_ methods);
641 710
642 if (ev_methods (EV_A)) 711 if (ev_method (EV_A))
643 return loop; 712 return loop;
644 713
645 return 0; 714 return 0;
646} 715}
647 716
… …
724 793
725 loop_destroy (EV_A); 794 loop_destroy (EV_A);
726} 795}
727 796
728void 797void
729ev_default_fork (EV_P) 798ev_default_fork (void)
730{ 799{
800#if EV_MULTIPLICITY
801 struct ev_loop *loop = default_loop;
802#endif
803
731 loop_fork (EV_A); 804 loop_fork (EV_A);
732 805
733 ev_io_stop (EV_A_ &sigev); 806 ev_io_stop (EV_A_ &sigev);
734 close (sigpipe [0]); 807 close (sigpipe [0]);
735 close (sigpipe [1]); 808 close (sigpipe [1]);
… …
760} 833}
761 834
762static void 835static void
763timers_reify (EV_P) 836timers_reify (EV_P)
764{ 837{
765 while (timercnt && timers [0]->at <= mn_now) 838 while (timercnt && ((WT)timers [0])->at <= mn_now)
766 { 839 {
767 struct ev_timer *w = timers [0]; 840 struct ev_timer *w = timers [0];
841
842 assert (("inactive timer on timer heap detected", ev_is_active (w)));
768 843
769 /* first reschedule or stop timer */ 844 /* first reschedule or stop timer */
770 if (w->repeat) 845 if (w->repeat)
771 { 846 {
772 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 847 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
773 w->at = mn_now + w->repeat; 848 ((WT)w)->at = mn_now + w->repeat;
774 downheap ((WT *)timers, timercnt, 0); 849 downheap ((WT *)timers, timercnt, 0);
775 } 850 }
776 else 851 else
777 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 852 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
778 853
… …
781} 856}
782 857
783static void 858static void
784periodics_reify (EV_P) 859periodics_reify (EV_P)
785{ 860{
786 while (periodiccnt && periodics [0]->at <= rt_now) 861 while (periodiccnt && ((WT)periodics [0])->at <= rt_now)
787 { 862 {
788 struct ev_periodic *w = periodics [0]; 863 struct ev_periodic *w = periodics [0];
864
865 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
789 866
790 /* first reschedule or stop timer */ 867 /* first reschedule or stop timer */
791 if (w->interval) 868 if (w->interval)
792 { 869 {
793 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval; 870 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
794 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now)); 871 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
795 downheap ((WT *)periodics, periodiccnt, 0); 872 downheap ((WT *)periodics, periodiccnt, 0);
796 } 873 }
797 else 874 else
798 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 875 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
799 876
… …
811 { 888 {
812 struct ev_periodic *w = periodics [i]; 889 struct ev_periodic *w = periodics [i];
813 890
814 if (w->interval) 891 if (w->interval)
815 { 892 {
816 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval; 893 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
817 894
818 if (fabs (diff) >= 1e-4) 895 if (fabs (diff) >= 1e-4)
819 { 896 {
820 ev_periodic_stop (EV_A_ w); 897 ev_periodic_stop (EV_A_ w);
821 ev_periodic_start (EV_A_ w); 898 ev_periodic_start (EV_A_ w);
… …
882 { 959 {
883 periodics_reschedule (EV_A); 960 periodics_reschedule (EV_A);
884 961
885 /* adjust timers. this is easy, as the offset is the same for all */ 962 /* adjust timers. this is easy, as the offset is the same for all */
886 for (i = 0; i < timercnt; ++i) 963 for (i = 0; i < timercnt; ++i)
887 timers [i]->at += rt_now - mn_now; 964 ((WT)timers [i])->at += rt_now - mn_now;
888 } 965 }
889 966
890 mn_now = rt_now; 967 mn_now = rt_now;
891 } 968 }
892} 969}
… …
943 { 1020 {
944 block = MAX_BLOCKTIME; 1021 block = MAX_BLOCKTIME;
945 1022
946 if (timercnt) 1023 if (timercnt)
947 { 1024 {
948 ev_tstamp to = timers [0]->at - mn_now + method_fudge; 1025 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
949 if (block > to) block = to; 1026 if (block > to) block = to;
950 } 1027 }
951 1028
952 if (periodiccnt) 1029 if (periodiccnt)
953 { 1030 {
954 ev_tstamp to = periodics [0]->at - rt_now + method_fudge; 1031 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge;
955 if (block > to) block = to; 1032 if (block > to) block = to;
956 } 1033 }
957 1034
958 if (block < 0.) block = 0.; 1035 if (block < 0.) block = 0.;
959 } 1036 }
… …
1076ev_timer_start (EV_P_ struct ev_timer *w) 1153ev_timer_start (EV_P_ struct ev_timer *w)
1077{ 1154{
1078 if (ev_is_active (w)) 1155 if (ev_is_active (w))
1079 return; 1156 return;
1080 1157
1081 w->at += mn_now; 1158 ((WT)w)->at += mn_now;
1082 1159
1083 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1160 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1084 1161
1085 ev_start (EV_A_ (W)w, ++timercnt); 1162 ev_start (EV_A_ (W)w, ++timercnt);
1086 array_needsize (timers, timermax, timercnt, ); 1163 array_needsize (timers, timermax, timercnt, );
1087 timers [timercnt - 1] = w; 1164 timers [timercnt - 1] = w;
1088 upheap ((WT *)timers, timercnt - 1); 1165 upheap ((WT *)timers, timercnt - 1);
1166
1167 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1089} 1168}
1090 1169
1091void 1170void
1092ev_timer_stop (EV_P_ struct ev_timer *w) 1171ev_timer_stop (EV_P_ struct ev_timer *w)
1093{ 1172{
1094 ev_clear_pending (EV_A_ (W)w); 1173 ev_clear_pending (EV_A_ (W)w);
1095 if (!ev_is_active (w)) 1174 if (!ev_is_active (w))
1096 return; 1175 return;
1097 1176
1177 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1178
1098 if (w->active < timercnt--) 1179 if (((W)w)->active < timercnt--)
1099 { 1180 {
1100 timers [w->active - 1] = timers [timercnt]; 1181 timers [((W)w)->active - 1] = timers [timercnt];
1101 downheap ((WT *)timers, timercnt, w->active - 1); 1182 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1102 } 1183 }
1103 1184
1104 w->at = w->repeat; 1185 ((WT)w)->at = w->repeat;
1105 1186
1106 ev_stop (EV_A_ (W)w); 1187 ev_stop (EV_A_ (W)w);
1107} 1188}
1108 1189
1109void 1190void
… …
1111{ 1192{
1112 if (ev_is_active (w)) 1193 if (ev_is_active (w))
1113 { 1194 {
1114 if (w->repeat) 1195 if (w->repeat)
1115 { 1196 {
1116 w->at = mn_now + w->repeat; 1197 ((WT)w)->at = mn_now + w->repeat;
1117 downheap ((WT *)timers, timercnt, w->active - 1); 1198 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1118 } 1199 }
1119 else 1200 else
1120 ev_timer_stop (EV_A_ w); 1201 ev_timer_stop (EV_A_ w);
1121 } 1202 }
1122 else if (w->repeat) 1203 else if (w->repeat)
… …
1131 1212
1132 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1213 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1133 1214
1134 /* this formula differs from the one in periodic_reify because we do not always round up */ 1215 /* this formula differs from the one in periodic_reify because we do not always round up */
1135 if (w->interval) 1216 if (w->interval)
1136 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval; 1217 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1137 1218
1138 ev_start (EV_A_ (W)w, ++periodiccnt); 1219 ev_start (EV_A_ (W)w, ++periodiccnt);
1139 array_needsize (periodics, periodicmax, periodiccnt, ); 1220 array_needsize (periodics, periodicmax, periodiccnt, );
1140 periodics [periodiccnt - 1] = w; 1221 periodics [periodiccnt - 1] = w;
1141 upheap ((WT *)periodics, periodiccnt - 1); 1222 upheap ((WT *)periodics, periodiccnt - 1);
1223
1224 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1142} 1225}
1143 1226
1144void 1227void
1145ev_periodic_stop (EV_P_ struct ev_periodic *w) 1228ev_periodic_stop (EV_P_ struct ev_periodic *w)
1146{ 1229{
1147 ev_clear_pending (EV_A_ (W)w); 1230 ev_clear_pending (EV_A_ (W)w);
1148 if (!ev_is_active (w)) 1231 if (!ev_is_active (w))
1149 return; 1232 return;
1150 1233
1234 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1235
1151 if (w->active < periodiccnt--) 1236 if (((W)w)->active < periodiccnt--)
1152 { 1237 {
1153 periodics [w->active - 1] = periodics [periodiccnt]; 1238 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1154 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1239 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1155 } 1240 }
1156 1241
1157 ev_stop (EV_A_ (W)w); 1242 ev_stop (EV_A_ (W)w);
1158} 1243}
1159 1244
… …
1173{ 1258{
1174 ev_clear_pending (EV_A_ (W)w); 1259 ev_clear_pending (EV_A_ (W)w);
1175 if (ev_is_active (w)) 1260 if (ev_is_active (w))
1176 return; 1261 return;
1177 1262
1178 idles [w->active - 1] = idles [--idlecnt]; 1263 idles [((W)w)->active - 1] = idles [--idlecnt];
1179 ev_stop (EV_A_ (W)w); 1264 ev_stop (EV_A_ (W)w);
1180} 1265}
1181 1266
1182void 1267void
1183ev_prepare_start (EV_P_ struct ev_prepare *w) 1268ev_prepare_start (EV_P_ struct ev_prepare *w)
… …
1195{ 1280{
1196 ev_clear_pending (EV_A_ (W)w); 1281 ev_clear_pending (EV_A_ (W)w);
1197 if (ev_is_active (w)) 1282 if (ev_is_active (w))
1198 return; 1283 return;
1199 1284
1200 prepares [w->active - 1] = prepares [--preparecnt]; 1285 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1201 ev_stop (EV_A_ (W)w); 1286 ev_stop (EV_A_ (W)w);
1202} 1287}
1203 1288
1204void 1289void
1205ev_check_start (EV_P_ struct ev_check *w) 1290ev_check_start (EV_P_ struct ev_check *w)
… …
1217{ 1302{
1218 ev_clear_pending (EV_A_ (W)w); 1303 ev_clear_pending (EV_A_ (W)w);
1219 if (ev_is_active (w)) 1304 if (ev_is_active (w))
1220 return; 1305 return;
1221 1306
1222 checks [w->active - 1] = checks [--checkcnt]; 1307 checks [((W)w)->active - 1] = checks [--checkcnt];
1223 ev_stop (EV_A_ (W)w); 1308 ev_stop (EV_A_ (W)w);
1224} 1309}
1225 1310
1226#ifndef SA_RESTART 1311#ifndef SA_RESTART
1227# define SA_RESTART 0 1312# define SA_RESTART 0
… …
1240 1325
1241 ev_start (EV_A_ (W)w, 1); 1326 ev_start (EV_A_ (W)w, 1);
1242 array_needsize (signals, signalmax, w->signum, signals_init); 1327 array_needsize (signals, signalmax, w->signum, signals_init);
1243 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1328 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1244 1329
1245 if (!w->next) 1330 if (!((WL)w)->next)
1246 { 1331 {
1332#if WIN32
1333 signal (w->signum, sighandler);
1334#else
1247 struct sigaction sa; 1335 struct sigaction sa;
1248 sa.sa_handler = sighandler; 1336 sa.sa_handler = sighandler;
1249 sigfillset (&sa.sa_mask); 1337 sigfillset (&sa.sa_mask);
1250 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1338 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1251 sigaction (w->signum, &sa, 0); 1339 sigaction (w->signum, &sa, 0);
1340#endif
1252 } 1341 }
1253} 1342}
1254 1343
1255void 1344void
1256ev_signal_stop (EV_P_ struct ev_signal *w) 1345ev_signal_stop (EV_P_ struct ev_signal *w)

Diff Legend

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