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

Comparing libev/ev.c (file contents):
Revision 1.60 by root, Sun Nov 4 18:29:44 2007 UTC vs.
Revision 1.74 by root, Tue Nov 6 16:51:20 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
… …
90# define EV_USE_EPOLL 0 91# define EV_USE_EPOLL 0
91#endif 92#endif
92 93
93#ifndef EV_USE_KQUEUE 94#ifndef EV_USE_KQUEUE
94# define EV_USE_KQUEUE 0 95# define EV_USE_KQUEUE 0
96#endif
97
98#ifndef EV_USE_WIN32
99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
102# define EV_USE_SELECT 1
103# else
104# define EV_USE_WIN32 0
105# endif
95#endif 106#endif
96 107
97#ifndef EV_USE_REALTIME 108#ifndef EV_USE_REALTIME
98# define EV_USE_REALTIME 1 109# define EV_USE_REALTIME 1
99#endif 110#endif
… …
137typedef struct ev_watcher_list *WL; 148typedef struct ev_watcher_list *WL;
138typedef struct ev_watcher_time *WT; 149typedef struct ev_watcher_time *WT;
139 150
140static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
141 152
153#include "ev_win32.c"
154
142/*****************************************************************************/ 155/*****************************************************************************/
143 156
157static void (*syserr_cb)(const char *msg);
158
159void ev_set_syserr_cb (void (*cb)(const char *msg))
160{
161 syserr_cb = cb;
162}
163
164static void
165syserr (const char *msg)
166{
167 if (!msg)
168 msg = "(libev) system error";
169
170 if (syserr_cb)
171 syserr_cb (msg);
172 else
173 {
174 perror (msg);
175 abort ();
176 }
177}
178
179static void *(*alloc)(void *ptr, long size);
180
181void ev_set_allocator (void *(*cb)(void *ptr, long size))
182{
183 alloc = cb;
184}
185
186static void *
187ev_realloc (void *ptr, long size)
188{
189 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
190
191 if (!ptr && size)
192 {
193 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
194 abort ();
195 }
196
197 return ptr;
198}
199
200#define ev_malloc(size) ev_realloc (0, (size))
201#define ev_free(ptr) ev_realloc ((ptr), 0)
202
203/*****************************************************************************/
204
144typedef struct 205typedef struct
145{ 206{
146 struct ev_watcher_list *head; 207 WL head;
147 unsigned char events; 208 unsigned char events;
148 unsigned char reify; 209 unsigned char reify;
149} ANFD; 210} ANFD;
150 211
151typedef struct 212typedef struct
… …
207ev_now (EV_P) 268ev_now (EV_P)
208{ 269{
209 return rt_now; 270 return rt_now;
210} 271}
211 272
212#define array_roundsize(base,n) ((n) | 4 & ~3) 273#define array_roundsize(type,n) ((n) | 4 & ~3)
213 274
214#define array_needsize(base,cur,cnt,init) \ 275#define array_needsize(type,base,cur,cnt,init) \
215 if (expect_false ((cnt) > cur)) \ 276 if (expect_false ((cnt) > cur)) \
216 { \ 277 { \
217 int newcnt = cur; \ 278 int newcnt = cur; \
218 do \ 279 do \
219 { \ 280 { \
220 newcnt = array_roundsize (base, newcnt << 1); \ 281 newcnt = array_roundsize (type, newcnt << 1); \
221 } \ 282 } \
222 while ((cnt) > newcnt); \ 283 while ((cnt) > newcnt); \
223 \ 284 \
224 base = realloc (base, sizeof (*base) * (newcnt)); \ 285 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
225 init (base + cur, newcnt - cur); \ 286 init (base + cur, newcnt - cur); \
226 cur = newcnt; \ 287 cur = newcnt; \
227 } 288 }
289
290#define array_slim(type,stem) \
291 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
292 { \
293 stem ## max = array_roundsize (stem ## cnt >> 1); \
294 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
295 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
296 }
297
298/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
299/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
300#define array_free_microshit(stem) \
301 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
302
303#define array_free(stem, idx) \
304 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
228 305
229/*****************************************************************************/ 306/*****************************************************************************/
230 307
231static void 308static void
232anfds_init (ANFD *base, int count) 309anfds_init (ANFD *base, int count)
… …
249 pendings [ABSPRI (w)][w->pending - 1].events |= events; 326 pendings [ABSPRI (w)][w->pending - 1].events |= events;
250 return; 327 return;
251 } 328 }
252 329
253 w->pending = ++pendingcnt [ABSPRI (w)]; 330 w->pending = ++pendingcnt [ABSPRI (w)];
254 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 331 array_needsize (ANPENDING, pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], (void));
255 pendings [ABSPRI (w)][w->pending - 1].w = w; 332 pendings [ABSPRI (w)][w->pending - 1].w = w;
256 pendings [ABSPRI (w)][w->pending - 1].events = events; 333 pendings [ABSPRI (w)][w->pending - 1].events = events;
257} 334}
258 335
259static void 336static void
… …
298 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 375 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
299 events |= w->events; 376 events |= w->events;
300 377
301 anfd->reify = 0; 378 anfd->reify = 0;
302 379
303 if (anfd->events != events)
304 {
305 method_modify (EV_A_ fd, anfd->events, events); 380 method_modify (EV_A_ fd, anfd->events, events);
306 anfd->events = events; 381 anfd->events = events;
307 }
308 } 382 }
309 383
310 fdchangecnt = 0; 384 fdchangecnt = 0;
311} 385}
312 386
313static void 387static void
314fd_change (EV_P_ int fd) 388fd_change (EV_P_ int fd)
315{ 389{
316 if (anfds [fd].reify || fdchangecnt < 0) 390 if (anfds [fd].reify)
317 return; 391 return;
318 392
319 anfds [fd].reify = 1; 393 anfds [fd].reify = 1;
320 394
321 ++fdchangecnt; 395 ++fdchangecnt;
322 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 396 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
323 fdchanges [fdchangecnt - 1] = fd; 397 fdchanges [fdchangecnt - 1] = fd;
324} 398}
325 399
326static void 400static void
327fd_kill (EV_P_ int fd) 401fd_kill (EV_P_ int fd)
… …
333 ev_io_stop (EV_A_ w); 407 ev_io_stop (EV_A_ w);
334 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 408 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
335 } 409 }
336} 410}
337 411
412static int
413fd_valid (int fd)
414{
415#ifdef WIN32
416 return !!win32_get_osfhandle (fd);
417#else
418 return fcntl (fd, F_GETFD) != -1;
419#endif
420}
421
338/* called on EBADF to verify fds */ 422/* called on EBADF to verify fds */
339static void 423static void
340fd_ebadf (EV_P) 424fd_ebadf (EV_P)
341{ 425{
342 int fd; 426 int fd;
343 427
344 for (fd = 0; fd < anfdmax; ++fd) 428 for (fd = 0; fd < anfdmax; ++fd)
345 if (anfds [fd].events) 429 if (anfds [fd].events)
346 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 430 if (!fd_valid (fd) == -1 && errno == EBADF)
347 fd_kill (EV_A_ fd); 431 fd_kill (EV_A_ fd);
348} 432}
349 433
350/* called on ENOMEM in select/poll to kill some fds and retry */ 434/* called on ENOMEM in select/poll to kill some fds and retry */
351static void 435static void
352fd_enomem (EV_P) 436fd_enomem (EV_P)
353{ 437{
354 int fd = anfdmax; 438 int fd;
355 439
356 while (fd--) 440 for (fd = anfdmax; fd--; )
357 if (anfds [fd].events) 441 if (anfds [fd].events)
358 { 442 {
359 close (fd);
360 fd_kill (EV_A_ fd); 443 fd_kill (EV_A_ fd);
361 return; 444 return;
362 } 445 }
363} 446}
364 447
365/* susually called after fork if method needs to re-arm all fds from scratch */ 448/* usually called after fork if method needs to re-arm all fds from scratch */
366static void 449static void
367fd_rearm_all (EV_P) 450fd_rearm_all (EV_P)
368{ 451{
369 int fd; 452 int fd;
370 453
… …
385 WT w = heap [k]; 468 WT w = heap [k];
386 469
387 while (k && heap [k >> 1]->at > w->at) 470 while (k && heap [k >> 1]->at > w->at)
388 { 471 {
389 heap [k] = heap [k >> 1]; 472 heap [k] = heap [k >> 1];
390 heap [k]->active = k + 1; 473 ((W)heap [k])->active = k + 1;
391 k >>= 1; 474 k >>= 1;
392 } 475 }
393 476
394 heap [k] = w; 477 heap [k] = w;
395 heap [k]->active = k + 1; 478 ((W)heap [k])->active = k + 1;
396 479
397} 480}
398 481
399static void 482static void
400downheap (WT *heap, int N, int k) 483downheap (WT *heap, int N, int k)
… …
410 493
411 if (w->at <= heap [j]->at) 494 if (w->at <= heap [j]->at)
412 break; 495 break;
413 496
414 heap [k] = heap [j]; 497 heap [k] = heap [j];
415 heap [k]->active = k + 1; 498 ((W)heap [k])->active = k + 1;
416 k = j; 499 k = j;
417 } 500 }
418 501
419 heap [k] = w; 502 heap [k] = w;
420 heap [k]->active = k + 1; 503 ((W)heap [k])->active = k + 1;
421} 504}
422 505
423/*****************************************************************************/ 506/*****************************************************************************/
424 507
425typedef struct 508typedef struct
426{ 509{
427 struct ev_watcher_list *head; 510 WL head;
428 sig_atomic_t volatile gotsig; 511 sig_atomic_t volatile gotsig;
429} ANSIG; 512} ANSIG;
430 513
431static ANSIG *signals; 514static ANSIG *signals;
432static int signalmax; 515static int signalmax;
… …
448} 531}
449 532
450static void 533static void
451sighandler (int signum) 534sighandler (int signum)
452{ 535{
536#if WIN32
537 signal (signum, sighandler);
538#endif
539
453 signals [signum - 1].gotsig = 1; 540 signals [signum - 1].gotsig = 1;
454 541
455 if (!gotsig) 542 if (!gotsig)
456 { 543 {
457 int old_errno = errno; 544 int old_errno = errno;
… …
462} 549}
463 550
464static void 551static void
465sigcb (EV_P_ struct ev_io *iow, int revents) 552sigcb (EV_P_ struct ev_io *iow, int revents)
466{ 553{
467 struct ev_watcher_list *w; 554 WL w;
468 int signum; 555 int signum;
469 556
470 read (sigpipe [0], &revents, 1); 557 read (sigpipe [0], &revents, 1);
471 gotsig = 0; 558 gotsig = 0;
472 559
… …
497 ev_unref (EV_A); /* child watcher should not keep loop alive */ 584 ev_unref (EV_A); /* child watcher should not keep loop alive */
498} 585}
499 586
500/*****************************************************************************/ 587/*****************************************************************************/
501 588
589static struct ev_child *childs [PID_HASHSIZE];
590
502#ifndef WIN32 591#ifndef WIN32
503 592
504static struct ev_child *childs [PID_HASHSIZE];
505static struct ev_signal childev; 593static struct ev_signal childev;
506 594
507#ifndef WCONTINUED 595#ifndef WCONTINUED
508# define WCONTINUED 0 596# define WCONTINUED 0
509#endif 597#endif
… …
514 struct ev_child *w; 602 struct ev_child *w;
515 603
516 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 604 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
517 if (w->pid == pid || !w->pid) 605 if (w->pid == pid || !w->pid)
518 { 606 {
519 w->priority = sw->priority; /* need to do it *now* */ 607 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
520 w->rpid = pid; 608 w->rpid = pid;
521 w->rstatus = status; 609 w->rstatus = status;
522 event (EV_A_ (W)w, EV_CHILD); 610 event (EV_A_ (W)w, EV_CHILD);
523 } 611 }
524} 612}
525 613
526static void 614static void
… …
608 methods = atoi (getenv ("LIBEV_METHODS")); 696 methods = atoi (getenv ("LIBEV_METHODS"));
609 else 697 else
610 methods = EVMETHOD_ANY; 698 methods = EVMETHOD_ANY;
611 699
612 method = 0; 700 method = 0;
701#if EV_USE_WIN32
702 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
703#endif
613#if EV_USE_KQUEUE 704#if EV_USE_KQUEUE
614 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 705 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
615#endif 706#endif
616#if EV_USE_EPOLL 707#if EV_USE_EPOLL
617 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 708 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
… …
620 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 711 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
621#endif 712#endif
622#if EV_USE_SELECT 713#if EV_USE_SELECT
623 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 714 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
624#endif 715#endif
716
717 ev_watcher_init (&sigev, sigcb);
718 ev_set_priority (&sigev, EV_MAXPRI);
625 } 719 }
626} 720}
627 721
628void 722void
629loop_destroy (EV_P) 723loop_destroy (EV_P)
630{ 724{
725 int i;
726
727#if EV_USE_WIN32
728 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
729#endif
631#if EV_USE_KQUEUE 730#if EV_USE_KQUEUE
632 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 731 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
633#endif 732#endif
634#if EV_USE_EPOLL 733#if EV_USE_EPOLL
635 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 734 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
639#endif 738#endif
640#if EV_USE_SELECT 739#if EV_USE_SELECT
641 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 740 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
642#endif 741#endif
643 742
743 for (i = NUMPRI; i--; )
744 array_free (pending, [i]);
745
746 /* have to use the microsoft-never-gets-it-right macro */
747 array_free_microshit (fdchange);
748 array_free_microshit (timer);
749 array_free_microshit (periodic);
750 array_free_microshit (idle);
751 array_free_microshit (prepare);
752 array_free_microshit (check);
753
644 method = 0; 754 method = 0;
645 /*TODO*/
646} 755}
647 756
648void 757static void
649loop_fork (EV_P) 758loop_fork (EV_P)
650{ 759{
651 /*TODO*/
652#if EV_USE_EPOLL 760#if EV_USE_EPOLL
653 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 761 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
654#endif 762#endif
655#if EV_USE_KQUEUE 763#if EV_USE_KQUEUE
656 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 764 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
657#endif 765#endif
766
767 if (ev_is_active (&sigev))
768 {
769 /* default loop */
770
771 ev_ref (EV_A);
772 ev_io_stop (EV_A_ &sigev);
773 close (sigpipe [0]);
774 close (sigpipe [1]);
775
776 while (pipe (sigpipe))
777 syserr ("(libev) error creating pipe");
778
779 siginit (EV_A);
780 }
781
782 postfork = 0;
658} 783}
659 784
660#if EV_MULTIPLICITY 785#if EV_MULTIPLICITY
661struct ev_loop * 786struct ev_loop *
662ev_loop_new (int methods) 787ev_loop_new (int methods)
663{ 788{
664 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 789 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
790
791 memset (loop, 0, sizeof (struct ev_loop));
665 792
666 loop_init (EV_A_ methods); 793 loop_init (EV_A_ methods);
667 794
668 if (ev_method (EV_A)) 795 if (ev_method (EV_A))
669 return loop; 796 return loop;
… …
673 800
674void 801void
675ev_loop_destroy (EV_P) 802ev_loop_destroy (EV_P)
676{ 803{
677 loop_destroy (EV_A); 804 loop_destroy (EV_A);
678 free (loop); 805 ev_free (loop);
679} 806}
680 807
681void 808void
682ev_loop_fork (EV_P) 809ev_loop_fork (EV_P)
683{ 810{
684 loop_fork (EV_A); 811 postfork = 1;
685} 812}
686 813
687#endif 814#endif
688 815
689#if EV_MULTIPLICITY 816#if EV_MULTIPLICITY
… …
712 839
713 loop_init (EV_A_ methods); 840 loop_init (EV_A_ methods);
714 841
715 if (ev_method (EV_A)) 842 if (ev_method (EV_A))
716 { 843 {
717 ev_watcher_init (&sigev, sigcb);
718 ev_set_priority (&sigev, EV_MAXPRI);
719 siginit (EV_A); 844 siginit (EV_A);
720 845
721#ifndef WIN32 846#ifndef WIN32
722 ev_signal_init (&childev, childcb, SIGCHLD); 847 ev_signal_init (&childev, childcb, SIGCHLD);
723 ev_set_priority (&childev, EV_MAXPRI); 848 ev_set_priority (&childev, EV_MAXPRI);
… …
737{ 862{
738#if EV_MULTIPLICITY 863#if EV_MULTIPLICITY
739 struct ev_loop *loop = default_loop; 864 struct ev_loop *loop = default_loop;
740#endif 865#endif
741 866
867#ifndef WIN32
742 ev_ref (EV_A); /* child watcher */ 868 ev_ref (EV_A); /* child watcher */
743 ev_signal_stop (EV_A_ &childev); 869 ev_signal_stop (EV_A_ &childev);
870#endif
744 871
745 ev_ref (EV_A); /* signal watcher */ 872 ev_ref (EV_A); /* signal watcher */
746 ev_io_stop (EV_A_ &sigev); 873 ev_io_stop (EV_A_ &sigev);
747 874
748 close (sigpipe [0]); sigpipe [0] = 0; 875 close (sigpipe [0]); sigpipe [0] = 0;
… …
756{ 883{
757#if EV_MULTIPLICITY 884#if EV_MULTIPLICITY
758 struct ev_loop *loop = default_loop; 885 struct ev_loop *loop = default_loop;
759#endif 886#endif
760 887
761 loop_fork (EV_A); 888 if (method)
762 889 postfork = 1;
763 ev_io_stop (EV_A_ &sigev);
764 close (sigpipe [0]);
765 close (sigpipe [1]);
766 pipe (sigpipe);
767
768 ev_ref (EV_A); /* signal watcher */
769 siginit (EV_A);
770} 890}
771 891
772/*****************************************************************************/ 892/*****************************************************************************/
773 893
774static void 894static void
… …
790} 910}
791 911
792static void 912static void
793timers_reify (EV_P) 913timers_reify (EV_P)
794{ 914{
795 while (timercnt && timers [0]->at <= mn_now) 915 while (timercnt && ((WT)timers [0])->at <= mn_now)
796 { 916 {
797 struct ev_timer *w = timers [0]; 917 struct ev_timer *w = timers [0];
918
919 assert (("inactive timer on timer heap detected", ev_is_active (w)));
798 920
799 /* first reschedule or stop timer */ 921 /* first reschedule or stop timer */
800 if (w->repeat) 922 if (w->repeat)
801 { 923 {
802 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 924 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
803 w->at = mn_now + w->repeat; 925 ((WT)w)->at = mn_now + w->repeat;
804 downheap ((WT *)timers, timercnt, 0); 926 downheap ((WT *)timers, timercnt, 0);
805 } 927 }
806 else 928 else
807 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 929 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
808 930
… …
811} 933}
812 934
813static void 935static void
814periodics_reify (EV_P) 936periodics_reify (EV_P)
815{ 937{
816 while (periodiccnt && periodics [0]->at <= rt_now) 938 while (periodiccnt && ((WT)periodics [0])->at <= rt_now)
817 { 939 {
818 struct ev_periodic *w = periodics [0]; 940 struct ev_periodic *w = periodics [0];
941
942 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
819 943
820 /* first reschedule or stop timer */ 944 /* first reschedule or stop timer */
821 if (w->interval) 945 if (w->interval)
822 { 946 {
823 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval; 947 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
824 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now)); 948 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
825 downheap ((WT *)periodics, periodiccnt, 0); 949 downheap ((WT *)periodics, periodiccnt, 0);
826 } 950 }
827 else 951 else
828 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 952 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
829 953
… …
841 { 965 {
842 struct ev_periodic *w = periodics [i]; 966 struct ev_periodic *w = periodics [i];
843 967
844 if (w->interval) 968 if (w->interval)
845 { 969 {
846 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval; 970 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
847 971
848 if (fabs (diff) >= 1e-4) 972 if (fabs (diff) >= 1e-4)
849 { 973 {
850 ev_periodic_stop (EV_A_ w); 974 ev_periodic_stop (EV_A_ w);
851 ev_periodic_start (EV_A_ w); 975 ev_periodic_start (EV_A_ w);
… …
912 { 1036 {
913 periodics_reschedule (EV_A); 1037 periodics_reschedule (EV_A);
914 1038
915 /* adjust timers. this is easy, as the offset is the same for all */ 1039 /* adjust timers. this is easy, as the offset is the same for all */
916 for (i = 0; i < timercnt; ++i) 1040 for (i = 0; i < timercnt; ++i)
917 timers [i]->at += rt_now - mn_now; 1041 ((WT)timers [i])->at += rt_now - mn_now;
918 } 1042 }
919 1043
920 mn_now = rt_now; 1044 mn_now = rt_now;
921 } 1045 }
922} 1046}
… …
948 { 1072 {
949 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1073 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
950 call_pending (EV_A); 1074 call_pending (EV_A);
951 } 1075 }
952 1076
1077 /* we might have forked, so reify kernel state if necessary */
1078 if (expect_false (postfork))
1079 loop_fork (EV_A);
1080
953 /* update fd-related kernel structures */ 1081 /* update fd-related kernel structures */
954 fd_reify (EV_A); 1082 fd_reify (EV_A);
955 1083
956 /* calculate blocking time */ 1084 /* calculate blocking time */
957 1085
… …
973 { 1101 {
974 block = MAX_BLOCKTIME; 1102 block = MAX_BLOCKTIME;
975 1103
976 if (timercnt) 1104 if (timercnt)
977 { 1105 {
978 ev_tstamp to = timers [0]->at - mn_now + method_fudge; 1106 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
979 if (block > to) block = to; 1107 if (block > to) block = to;
980 } 1108 }
981 1109
982 if (periodiccnt) 1110 if (periodiccnt)
983 { 1111 {
984 ev_tstamp to = periodics [0]->at - rt_now + method_fudge; 1112 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge;
985 if (block > to) block = to; 1113 if (block > to) block = to;
986 } 1114 }
987 1115
988 if (block < 0.) block = 0.; 1116 if (block < 0.) block = 0.;
989 } 1117 }
… …
1081 return; 1209 return;
1082 1210
1083 assert (("ev_io_start called with negative fd", fd >= 0)); 1211 assert (("ev_io_start called with negative fd", fd >= 0));
1084 1212
1085 ev_start (EV_A_ (W)w, 1); 1213 ev_start (EV_A_ (W)w, 1);
1086 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1214 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1087 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1215 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1088 1216
1089 fd_change (EV_A_ fd); 1217 fd_change (EV_A_ fd);
1090} 1218}
1091 1219
… …
1106ev_timer_start (EV_P_ struct ev_timer *w) 1234ev_timer_start (EV_P_ struct ev_timer *w)
1107{ 1235{
1108 if (ev_is_active (w)) 1236 if (ev_is_active (w))
1109 return; 1237 return;
1110 1238
1111 w->at += mn_now; 1239 ((WT)w)->at += mn_now;
1112 1240
1113 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1241 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1114 1242
1115 ev_start (EV_A_ (W)w, ++timercnt); 1243 ev_start (EV_A_ (W)w, ++timercnt);
1116 array_needsize (timers, timermax, timercnt, ); 1244 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1117 timers [timercnt - 1] = w; 1245 timers [timercnt - 1] = w;
1118 upheap ((WT *)timers, timercnt - 1); 1246 upheap ((WT *)timers, timercnt - 1);
1247
1248 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1119} 1249}
1120 1250
1121void 1251void
1122ev_timer_stop (EV_P_ struct ev_timer *w) 1252ev_timer_stop (EV_P_ struct ev_timer *w)
1123{ 1253{
1124 ev_clear_pending (EV_A_ (W)w); 1254 ev_clear_pending (EV_A_ (W)w);
1125 if (!ev_is_active (w)) 1255 if (!ev_is_active (w))
1126 return; 1256 return;
1127 1257
1258 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1259
1128 if (w->active < timercnt--) 1260 if (((W)w)->active < timercnt--)
1129 { 1261 {
1130 timers [w->active - 1] = timers [timercnt]; 1262 timers [((W)w)->active - 1] = timers [timercnt];
1131 downheap ((WT *)timers, timercnt, w->active - 1); 1263 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1132 } 1264 }
1133 1265
1134 w->at = w->repeat; 1266 ((WT)w)->at = w->repeat;
1135 1267
1136 ev_stop (EV_A_ (W)w); 1268 ev_stop (EV_A_ (W)w);
1137} 1269}
1138 1270
1139void 1271void
… …
1141{ 1273{
1142 if (ev_is_active (w)) 1274 if (ev_is_active (w))
1143 { 1275 {
1144 if (w->repeat) 1276 if (w->repeat)
1145 { 1277 {
1146 w->at = mn_now + w->repeat; 1278 ((WT)w)->at = mn_now + w->repeat;
1147 downheap ((WT *)timers, timercnt, w->active - 1); 1279 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1148 } 1280 }
1149 else 1281 else
1150 ev_timer_stop (EV_A_ w); 1282 ev_timer_stop (EV_A_ w);
1151 } 1283 }
1152 else if (w->repeat) 1284 else if (w->repeat)
… …
1161 1293
1162 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1294 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1163 1295
1164 /* this formula differs from the one in periodic_reify because we do not always round up */ 1296 /* this formula differs from the one in periodic_reify because we do not always round up */
1165 if (w->interval) 1297 if (w->interval)
1166 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval; 1298 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1167 1299
1168 ev_start (EV_A_ (W)w, ++periodiccnt); 1300 ev_start (EV_A_ (W)w, ++periodiccnt);
1169 array_needsize (periodics, periodicmax, periodiccnt, ); 1301 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1170 periodics [periodiccnt - 1] = w; 1302 periodics [periodiccnt - 1] = w;
1171 upheap ((WT *)periodics, periodiccnt - 1); 1303 upheap ((WT *)periodics, periodiccnt - 1);
1304
1305 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1172} 1306}
1173 1307
1174void 1308void
1175ev_periodic_stop (EV_P_ struct ev_periodic *w) 1309ev_periodic_stop (EV_P_ struct ev_periodic *w)
1176{ 1310{
1177 ev_clear_pending (EV_A_ (W)w); 1311 ev_clear_pending (EV_A_ (W)w);
1178 if (!ev_is_active (w)) 1312 if (!ev_is_active (w))
1179 return; 1313 return;
1180 1314
1315 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1316
1181 if (w->active < periodiccnt--) 1317 if (((W)w)->active < periodiccnt--)
1182 { 1318 {
1183 periodics [w->active - 1] = periodics [periodiccnt]; 1319 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1184 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1320 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1185 } 1321 }
1186 1322
1187 ev_stop (EV_A_ (W)w); 1323 ev_stop (EV_A_ (W)w);
1188} 1324}
1189 1325
… …
1192{ 1328{
1193 if (ev_is_active (w)) 1329 if (ev_is_active (w))
1194 return; 1330 return;
1195 1331
1196 ev_start (EV_A_ (W)w, ++idlecnt); 1332 ev_start (EV_A_ (W)w, ++idlecnt);
1197 array_needsize (idles, idlemax, idlecnt, ); 1333 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1198 idles [idlecnt - 1] = w; 1334 idles [idlecnt - 1] = w;
1199} 1335}
1200 1336
1201void 1337void
1202ev_idle_stop (EV_P_ struct ev_idle *w) 1338ev_idle_stop (EV_P_ struct ev_idle *w)
1203{ 1339{
1204 ev_clear_pending (EV_A_ (W)w); 1340 ev_clear_pending (EV_A_ (W)w);
1205 if (ev_is_active (w)) 1341 if (ev_is_active (w))
1206 return; 1342 return;
1207 1343
1208 idles [w->active - 1] = idles [--idlecnt]; 1344 idles [((W)w)->active - 1] = idles [--idlecnt];
1209 ev_stop (EV_A_ (W)w); 1345 ev_stop (EV_A_ (W)w);
1210} 1346}
1211 1347
1212void 1348void
1213ev_prepare_start (EV_P_ struct ev_prepare *w) 1349ev_prepare_start (EV_P_ struct ev_prepare *w)
1214{ 1350{
1215 if (ev_is_active (w)) 1351 if (ev_is_active (w))
1216 return; 1352 return;
1217 1353
1218 ev_start (EV_A_ (W)w, ++preparecnt); 1354 ev_start (EV_A_ (W)w, ++preparecnt);
1219 array_needsize (prepares, preparemax, preparecnt, ); 1355 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1220 prepares [preparecnt - 1] = w; 1356 prepares [preparecnt - 1] = w;
1221} 1357}
1222 1358
1223void 1359void
1224ev_prepare_stop (EV_P_ struct ev_prepare *w) 1360ev_prepare_stop (EV_P_ struct ev_prepare *w)
1225{ 1361{
1226 ev_clear_pending (EV_A_ (W)w); 1362 ev_clear_pending (EV_A_ (W)w);
1227 if (ev_is_active (w)) 1363 if (ev_is_active (w))
1228 return; 1364 return;
1229 1365
1230 prepares [w->active - 1] = prepares [--preparecnt]; 1366 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1231 ev_stop (EV_A_ (W)w); 1367 ev_stop (EV_A_ (W)w);
1232} 1368}
1233 1369
1234void 1370void
1235ev_check_start (EV_P_ struct ev_check *w) 1371ev_check_start (EV_P_ struct ev_check *w)
1236{ 1372{
1237 if (ev_is_active (w)) 1373 if (ev_is_active (w))
1238 return; 1374 return;
1239 1375
1240 ev_start (EV_A_ (W)w, ++checkcnt); 1376 ev_start (EV_A_ (W)w, ++checkcnt);
1241 array_needsize (checks, checkmax, checkcnt, ); 1377 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1242 checks [checkcnt - 1] = w; 1378 checks [checkcnt - 1] = w;
1243} 1379}
1244 1380
1245void 1381void
1246ev_check_stop (EV_P_ struct ev_check *w) 1382ev_check_stop (EV_P_ struct ev_check *w)
1247{ 1383{
1248 ev_clear_pending (EV_A_ (W)w); 1384 ev_clear_pending (EV_A_ (W)w);
1249 if (ev_is_active (w)) 1385 if (ev_is_active (w))
1250 return; 1386 return;
1251 1387
1252 checks [w->active - 1] = checks [--checkcnt]; 1388 checks [((W)w)->active - 1] = checks [--checkcnt];
1253 ev_stop (EV_A_ (W)w); 1389 ev_stop (EV_A_ (W)w);
1254} 1390}
1255 1391
1256#ifndef SA_RESTART 1392#ifndef SA_RESTART
1257# define SA_RESTART 0 1393# define SA_RESTART 0
… …
1267 return; 1403 return;
1268 1404
1269 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1405 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1270 1406
1271 ev_start (EV_A_ (W)w, 1); 1407 ev_start (EV_A_ (W)w, 1);
1272 array_needsize (signals, signalmax, w->signum, signals_init); 1408 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1273 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1409 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1274 1410
1275 if (!w->next) 1411 if (!((WL)w)->next)
1276 { 1412 {
1413#if WIN32
1414 signal (w->signum, sighandler);
1415#else
1277 struct sigaction sa; 1416 struct sigaction sa;
1278 sa.sa_handler = sighandler; 1417 sa.sa_handler = sighandler;
1279 sigfillset (&sa.sa_mask); 1418 sigfillset (&sa.sa_mask);
1280 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1419 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1281 sigaction (w->signum, &sa, 0); 1420 sigaction (w->signum, &sa, 0);
1421#endif
1282 } 1422 }
1283} 1423}
1284 1424
1285void 1425void
1286ev_signal_stop (EV_P_ struct ev_signal *w) 1426ev_signal_stop (EV_P_ struct ev_signal *w)
… …
1336 void (*cb)(int revents, void *arg) = once->cb; 1476 void (*cb)(int revents, void *arg) = once->cb;
1337 void *arg = once->arg; 1477 void *arg = once->arg;
1338 1478
1339 ev_io_stop (EV_A_ &once->io); 1479 ev_io_stop (EV_A_ &once->io);
1340 ev_timer_stop (EV_A_ &once->to); 1480 ev_timer_stop (EV_A_ &once->to);
1341 free (once); 1481 ev_free (once);
1342 1482
1343 cb (revents, arg); 1483 cb (revents, arg);
1344} 1484}
1345 1485
1346static void 1486static void
… …
1356} 1496}
1357 1497
1358void 1498void
1359ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1499ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1360{ 1500{
1361 struct ev_once *once = malloc (sizeof (struct ev_once)); 1501 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1362 1502
1363 if (!once) 1503 if (!once)
1364 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1504 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1365 else 1505 else
1366 { 1506 {

Diff Legend

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