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

Comparing libev/ev.c (file contents):
Revision 1.68 by root, Mon Nov 5 20:19:00 2007 UTC vs.
Revision 1.77 by root, Thu Nov 8 00:44:17 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
… …
145typedef struct ev_watcher_list *WL; 148typedef struct ev_watcher_list *WL;
146typedef struct ev_watcher_time *WT; 149typedef struct ev_watcher_time *WT;
147 150
148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
149 152
150#if WIN32 153#include "ev_win32.c"
151/* note: the comment below could not be substantiated, but what would I care */ 154
152/* MSDN says this is required to handle SIGFPE */ 155/*****************************************************************************/
153volatile double SIGFPE_REQ = 0.0f; 156
154#endif 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)
155 202
156/*****************************************************************************/ 203/*****************************************************************************/
157 204
158typedef struct 205typedef struct
159{ 206{
… …
221ev_now (EV_P) 268ev_now (EV_P)
222{ 269{
223 return rt_now; 270 return rt_now;
224} 271}
225 272
226#define array_roundsize(base,n) ((n) | 4 & ~3) 273#define array_roundsize(type,n) ((n) | 4 & ~3)
227 274
228#define array_needsize(base,cur,cnt,init) \ 275#define array_needsize(type,base,cur,cnt,init) \
229 if (expect_false ((cnt) > cur)) \ 276 if (expect_false ((cnt) > cur)) \
230 { \ 277 { \
231 int newcnt = cur; \ 278 int newcnt = cur; \
232 do \ 279 do \
233 { \ 280 { \
234 newcnt = array_roundsize (base, newcnt << 1); \ 281 newcnt = array_roundsize (type, newcnt << 1); \
235 } \ 282 } \
236 while ((cnt) > newcnt); \ 283 while ((cnt) > newcnt); \
237 \ 284 \
238 base = realloc (base, sizeof (*base) * (newcnt)); \ 285 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
239 init (base + cur, newcnt - cur); \ 286 init (base + cur, newcnt - cur); \
240 cur = newcnt; \ 287 cur = newcnt; \
241 } 288 }
242 289
243#define array_slim(stem) \ 290#define array_slim(type,stem) \
244 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 291 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
245 { \ 292 { \
246 stem ## max = array_roundsize (stem ## cnt >> 1); \ 293 stem ## max = array_roundsize (stem ## cnt >> 1); \
247 base = realloc (base, sizeof (*base) * (stem ## max)); \ 294 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
248 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 295 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
249 } 296 }
250 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
251#define array_free(stem, idx) \ 303#define array_free(stem, idx) \
252 free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 304 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
253 305
254/*****************************************************************************/ 306/*****************************************************************************/
255 307
256static void 308static void
257anfds_init (ANFD *base, int count) 309anfds_init (ANFD *base, int count)
… …
274 pendings [ABSPRI (w)][w->pending - 1].events |= events; 326 pendings [ABSPRI (w)][w->pending - 1].events |= events;
275 return; 327 return;
276 } 328 }
277 329
278 w->pending = ++pendingcnt [ABSPRI (w)]; 330 w->pending = ++pendingcnt [ABSPRI (w)];
279 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));
280 pendings [ABSPRI (w)][w->pending - 1].w = w; 332 pendings [ABSPRI (w)][w->pending - 1].w = w;
281 pendings [ABSPRI (w)][w->pending - 1].events = events; 333 pendings [ABSPRI (w)][w->pending - 1].events = events;
282} 334}
283 335
284static void 336static void
… …
333} 385}
334 386
335static void 387static void
336fd_change (EV_P_ int fd) 388fd_change (EV_P_ int fd)
337{ 389{
338 if (anfds [fd].reify || fdchangecnt < 0) 390 if (anfds [fd].reify)
339 return; 391 return;
340 392
341 anfds [fd].reify = 1; 393 anfds [fd].reify = 1;
342 394
343 ++fdchangecnt; 395 ++fdchangecnt;
344 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 396 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
345 fdchanges [fdchangecnt - 1] = fd; 397 fdchanges [fdchangecnt - 1] = fd;
346} 398}
347 399
348static void 400static void
349fd_kill (EV_P_ int fd) 401fd_kill (EV_P_ int fd)
… …
355 ev_io_stop (EV_A_ w); 407 ev_io_stop (EV_A_ w);
356 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 408 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
357 } 409 }
358} 410}
359 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
360/* called on EBADF to verify fds */ 422/* called on EBADF to verify fds */
361static void 423static void
362fd_ebadf (EV_P) 424fd_ebadf (EV_P)
363{ 425{
364 int fd; 426 int fd;
365 427
366 for (fd = 0; fd < anfdmax; ++fd) 428 for (fd = 0; fd < anfdmax; ++fd)
367 if (anfds [fd].events) 429 if (anfds [fd].events)
368 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 430 if (!fd_valid (fd) == -1 && errno == EBADF)
369 fd_kill (EV_A_ fd); 431 fd_kill (EV_A_ fd);
370} 432}
371 433
372/* 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 */
373static void 435static void
… …
381 fd_kill (EV_A_ fd); 443 fd_kill (EV_A_ fd);
382 return; 444 return;
383 } 445 }
384} 446}
385 447
386/* 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 */
387static void 449static void
388fd_rearm_all (EV_P) 450fd_rearm_all (EV_P)
389{ 451{
390 int fd; 452 int fd;
391 453
… …
479 541
480 if (!gotsig) 542 if (!gotsig)
481 { 543 {
482 int old_errno = errno; 544 int old_errno = errno;
483 gotsig = 1; 545 gotsig = 1;
546#ifdef WIN32
547 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
548#else
484 write (sigpipe [1], &signum, 1); 549 write (sigpipe [1], &signum, 1);
550#endif
485 errno = old_errno; 551 errno = old_errno;
486 } 552 }
487} 553}
488 554
489static void 555static void
490sigcb (EV_P_ struct ev_io *iow, int revents) 556sigcb (EV_P_ struct ev_io *iow, int revents)
491{ 557{
492 WL w; 558 WL w;
493 int signum; 559 int signum;
494 560
561#ifdef WIN32
562 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
563#else
495 read (sigpipe [0], &revents, 1); 564 read (sigpipe [0], &revents, 1);
565#endif
496 gotsig = 0; 566 gotsig = 0;
497 567
498 for (signum = signalmax; signum--; ) 568 for (signum = signalmax; signum--; )
499 if (signals [signum].gotsig) 569 if (signals [signum].gotsig)
500 { 570 {
… …
522 ev_unref (EV_A); /* child watcher should not keep loop alive */ 592 ev_unref (EV_A); /* child watcher should not keep loop alive */
523} 593}
524 594
525/*****************************************************************************/ 595/*****************************************************************************/
526 596
597static struct ev_child *childs [PID_HASHSIZE];
598
527#ifndef WIN32 599#ifndef WIN32
528 600
529static struct ev_child *childs [PID_HASHSIZE];
530static struct ev_signal childev; 601static struct ev_signal childev;
531 602
532#ifndef WCONTINUED 603#ifndef WCONTINUED
533# define WCONTINUED 0 604# define WCONTINUED 0
534#endif 605#endif
… …
648 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 719 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
649#endif 720#endif
650#if EV_USE_SELECT 721#if EV_USE_SELECT
651 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 722 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
652#endif 723#endif
724
725 ev_watcher_init (&sigev, sigcb);
726 ev_set_priority (&sigev, EV_MAXPRI);
653 } 727 }
654} 728}
655 729
656void 730void
657loop_destroy (EV_P) 731loop_destroy (EV_P)
… …
675#endif 749#endif
676 750
677 for (i = NUMPRI; i--; ) 751 for (i = NUMPRI; i--; )
678 array_free (pending, [i]); 752 array_free (pending, [i]);
679 753
754 /* have to use the microsoft-never-gets-it-right macro */
680 array_free (fdchange, ); 755 array_free_microshit (fdchange);
681 array_free (timer, ); 756 array_free_microshit (timer);
682 array_free (periodic, ); 757 array_free_microshit (periodic);
683 array_free (idle, ); 758 array_free_microshit (idle);
684 array_free (prepare, ); 759 array_free_microshit (prepare);
685 array_free (check, ); 760 array_free_microshit (check);
686 761
687 method = 0; 762 method = 0;
688 /*TODO*/
689} 763}
690 764
691void 765static void
692loop_fork (EV_P) 766loop_fork (EV_P)
693{ 767{
694 /*TODO*/
695#if EV_USE_EPOLL 768#if EV_USE_EPOLL
696 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 769 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
697#endif 770#endif
698#if EV_USE_KQUEUE 771#if EV_USE_KQUEUE
699 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 772 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
700#endif 773#endif
774
775 if (ev_is_active (&sigev))
776 {
777 /* default loop */
778
779 ev_ref (EV_A);
780 ev_io_stop (EV_A_ &sigev);
781 close (sigpipe [0]);
782 close (sigpipe [1]);
783
784 while (pipe (sigpipe))
785 syserr ("(libev) error creating pipe");
786
787 siginit (EV_A);
788 }
789
790 postfork = 0;
701} 791}
702 792
703#if EV_MULTIPLICITY 793#if EV_MULTIPLICITY
704struct ev_loop * 794struct ev_loop *
705ev_loop_new (int methods) 795ev_loop_new (int methods)
706{ 796{
707 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 797 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
798
799 memset (loop, 0, sizeof (struct ev_loop));
708 800
709 loop_init (EV_A_ methods); 801 loop_init (EV_A_ methods);
710 802
711 if (ev_method (EV_A)) 803 if (ev_method (EV_A))
712 return loop; 804 return loop;
… …
716 808
717void 809void
718ev_loop_destroy (EV_P) 810ev_loop_destroy (EV_P)
719{ 811{
720 loop_destroy (EV_A); 812 loop_destroy (EV_A);
721 free (loop); 813 ev_free (loop);
722} 814}
723 815
724void 816void
725ev_loop_fork (EV_P) 817ev_loop_fork (EV_P)
726{ 818{
727 loop_fork (EV_A); 819 postfork = 1;
728} 820}
729 821
730#endif 822#endif
731 823
732#if EV_MULTIPLICITY 824#if EV_MULTIPLICITY
… …
755 847
756 loop_init (EV_A_ methods); 848 loop_init (EV_A_ methods);
757 849
758 if (ev_method (EV_A)) 850 if (ev_method (EV_A))
759 { 851 {
760 ev_watcher_init (&sigev, sigcb);
761 ev_set_priority (&sigev, EV_MAXPRI);
762 siginit (EV_A); 852 siginit (EV_A);
763 853
764#ifndef WIN32 854#ifndef WIN32
765 ev_signal_init (&childev, childcb, SIGCHLD); 855 ev_signal_init (&childev, childcb, SIGCHLD);
766 ev_set_priority (&childev, EV_MAXPRI); 856 ev_set_priority (&childev, EV_MAXPRI);
… …
780{ 870{
781#if EV_MULTIPLICITY 871#if EV_MULTIPLICITY
782 struct ev_loop *loop = default_loop; 872 struct ev_loop *loop = default_loop;
783#endif 873#endif
784 874
875#ifndef WIN32
785 ev_ref (EV_A); /* child watcher */ 876 ev_ref (EV_A); /* child watcher */
786 ev_signal_stop (EV_A_ &childev); 877 ev_signal_stop (EV_A_ &childev);
878#endif
787 879
788 ev_ref (EV_A); /* signal watcher */ 880 ev_ref (EV_A); /* signal watcher */
789 ev_io_stop (EV_A_ &sigev); 881 ev_io_stop (EV_A_ &sigev);
790 882
791 close (sigpipe [0]); sigpipe [0] = 0; 883 close (sigpipe [0]); sigpipe [0] = 0;
… …
799{ 891{
800#if EV_MULTIPLICITY 892#if EV_MULTIPLICITY
801 struct ev_loop *loop = default_loop; 893 struct ev_loop *loop = default_loop;
802#endif 894#endif
803 895
804 loop_fork (EV_A); 896 if (method)
805 897 postfork = 1;
806 ev_io_stop (EV_A_ &sigev);
807 close (sigpipe [0]);
808 close (sigpipe [1]);
809 pipe (sigpipe);
810
811 ev_ref (EV_A); /* signal watcher */
812 siginit (EV_A);
813} 898}
814 899
815/*****************************************************************************/ 900/*****************************************************************************/
901
902static int
903any_pending (EV_P)
904{
905 int pri;
906
907 for (pri = NUMPRI; pri--; )
908 if (pendingcnt [pri])
909 return 1;
910
911 return 0;
912}
816 913
817static void 914static void
818call_pending (EV_P) 915call_pending (EV_P)
819{ 916{
820 int pri; 917 int pri;
… …
863 struct ev_periodic *w = periodics [0]; 960 struct ev_periodic *w = periodics [0];
864 961
865 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 962 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
866 963
867 /* first reschedule or stop timer */ 964 /* first reschedule or stop timer */
965 if (w->reschedule_cb)
966 {
967 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001);
968
969 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now));
970 downheap ((WT *)periodics, periodiccnt, 0);
971 }
868 if (w->interval) 972 else if (w->interval)
869 { 973 {
870 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 974 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
871 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 975 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
872 downheap ((WT *)periodics, periodiccnt, 0); 976 downheap ((WT *)periodics, periodiccnt, 0);
873 } 977 }
… …
886 /* adjust periodics after time jump */ 990 /* adjust periodics after time jump */
887 for (i = 0; i < periodiccnt; ++i) 991 for (i = 0; i < periodiccnt; ++i)
888 { 992 {
889 struct ev_periodic *w = periodics [i]; 993 struct ev_periodic *w = periodics [i];
890 994
995 if (w->reschedule_cb)
996 ((WT)w)->at = w->reschedule_cb (w, rt_now);
891 if (w->interval) 997 else if (w->interval)
892 {
893 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 998 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
894
895 if (fabs (diff) >= 1e-4)
896 {
897 ev_periodic_stop (EV_A_ w);
898 ev_periodic_start (EV_A_ w);
899
900 i = 0; /* restart loop, inefficient, but time jumps should be rare */
901 }
902 }
903 } 999 }
1000
1001 /* now rebuild the heap */
1002 for (i = periodiccnt >> 1; i--; )
1003 downheap ((WT *)periodics, periodiccnt, i);
904} 1004}
905 1005
906inline int 1006inline int
907time_update_monotonic (EV_P) 1007time_update_monotonic (EV_P)
908{ 1008{
… …
995 { 1095 {
996 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1096 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
997 call_pending (EV_A); 1097 call_pending (EV_A);
998 } 1098 }
999 1099
1100 /* we might have forked, so reify kernel state if necessary */
1101 if (expect_false (postfork))
1102 loop_fork (EV_A);
1103
1000 /* update fd-related kernel structures */ 1104 /* update fd-related kernel structures */
1001 fd_reify (EV_A); 1105 fd_reify (EV_A);
1002 1106
1003 /* calculate blocking time */ 1107 /* calculate blocking time */
1004 1108
1005 /* we only need this for !monotonic clockor timers, but as we basically 1109 /* we only need this for !monotonic clock or timers, but as we basically
1006 always have timers, we just calculate it always */ 1110 always have timers, we just calculate it always */
1007#if EV_USE_MONOTONIC 1111#if EV_USE_MONOTONIC
1008 if (expect_true (have_monotonic)) 1112 if (expect_true (have_monotonic))
1009 time_update_monotonic (EV_A); 1113 time_update_monotonic (EV_A);
1010 else 1114 else
… …
1043 /* queue pending timers and reschedule them */ 1147 /* queue pending timers and reschedule them */
1044 timers_reify (EV_A); /* relative timers called last */ 1148 timers_reify (EV_A); /* relative timers called last */
1045 periodics_reify (EV_A); /* absolute timers called first */ 1149 periodics_reify (EV_A); /* absolute timers called first */
1046 1150
1047 /* queue idle watchers unless io or timers are pending */ 1151 /* queue idle watchers unless io or timers are pending */
1048 if (!pendingcnt) 1152 if (idlecnt && !any_pending (EV_A))
1049 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1153 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1050 1154
1051 /* queue check watchers, to be executed first */ 1155 /* queue check watchers, to be executed first */
1052 if (checkcnt) 1156 if (checkcnt)
1053 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1157 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1128 return; 1232 return;
1129 1233
1130 assert (("ev_io_start called with negative fd", fd >= 0)); 1234 assert (("ev_io_start called with negative fd", fd >= 0));
1131 1235
1132 ev_start (EV_A_ (W)w, 1); 1236 ev_start (EV_A_ (W)w, 1);
1133 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1237 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1134 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1238 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1135 1239
1136 fd_change (EV_A_ fd); 1240 fd_change (EV_A_ fd);
1137} 1241}
1138 1242
… …
1158 ((WT)w)->at += mn_now; 1262 ((WT)w)->at += mn_now;
1159 1263
1160 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1264 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1161 1265
1162 ev_start (EV_A_ (W)w, ++timercnt); 1266 ev_start (EV_A_ (W)w, ++timercnt);
1163 array_needsize (timers, timermax, timercnt, ); 1267 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1164 timers [timercnt - 1] = w; 1268 timers [timercnt - 1] = w;
1165 upheap ((WT *)timers, timercnt - 1); 1269 upheap ((WT *)timers, timercnt - 1);
1166 1270
1167 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1271 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1168} 1272}
… …
1208ev_periodic_start (EV_P_ struct ev_periodic *w) 1312ev_periodic_start (EV_P_ struct ev_periodic *w)
1209{ 1313{
1210 if (ev_is_active (w)) 1314 if (ev_is_active (w))
1211 return; 1315 return;
1212 1316
1317 if (w->reschedule_cb)
1318 ((WT)w)->at = w->reschedule_cb (w, rt_now);
1319 else if (w->interval)
1320 {
1213 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1321 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1214
1215 /* this formula differs from the one in periodic_reify because we do not always round up */ 1322 /* this formula differs from the one in periodic_reify because we do not always round up */
1216 if (w->interval)
1217 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1323 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1324 }
1218 1325
1219 ev_start (EV_A_ (W)w, ++periodiccnt); 1326 ev_start (EV_A_ (W)w, ++periodiccnt);
1220 array_needsize (periodics, periodicmax, periodiccnt, ); 1327 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1221 periodics [periodiccnt - 1] = w; 1328 periodics [periodiccnt - 1] = w;
1222 upheap ((WT *)periodics, periodiccnt - 1); 1329 upheap ((WT *)periodics, periodiccnt - 1);
1223 1330
1224 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1331 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1225} 1332}
… …
1241 1348
1242 ev_stop (EV_A_ (W)w); 1349 ev_stop (EV_A_ (W)w);
1243} 1350}
1244 1351
1245void 1352void
1353ev_periodic_again (EV_P_ struct ev_periodic *w)
1354{
1355 ev_periodic_stop (EV_A_ w);
1356 ev_periodic_start (EV_A_ w);
1357}
1358
1359void
1246ev_idle_start (EV_P_ struct ev_idle *w) 1360ev_idle_start (EV_P_ struct ev_idle *w)
1247{ 1361{
1248 if (ev_is_active (w)) 1362 if (ev_is_active (w))
1249 return; 1363 return;
1250 1364
1251 ev_start (EV_A_ (W)w, ++idlecnt); 1365 ev_start (EV_A_ (W)w, ++idlecnt);
1252 array_needsize (idles, idlemax, idlecnt, ); 1366 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1253 idles [idlecnt - 1] = w; 1367 idles [idlecnt - 1] = w;
1254} 1368}
1255 1369
1256void 1370void
1257ev_idle_stop (EV_P_ struct ev_idle *w) 1371ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1269{ 1383{
1270 if (ev_is_active (w)) 1384 if (ev_is_active (w))
1271 return; 1385 return;
1272 1386
1273 ev_start (EV_A_ (W)w, ++preparecnt); 1387 ev_start (EV_A_ (W)w, ++preparecnt);
1274 array_needsize (prepares, preparemax, preparecnt, ); 1388 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1275 prepares [preparecnt - 1] = w; 1389 prepares [preparecnt - 1] = w;
1276} 1390}
1277 1391
1278void 1392void
1279ev_prepare_stop (EV_P_ struct ev_prepare *w) 1393ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1291{ 1405{
1292 if (ev_is_active (w)) 1406 if (ev_is_active (w))
1293 return; 1407 return;
1294 1408
1295 ev_start (EV_A_ (W)w, ++checkcnt); 1409 ev_start (EV_A_ (W)w, ++checkcnt);
1296 array_needsize (checks, checkmax, checkcnt, ); 1410 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1297 checks [checkcnt - 1] = w; 1411 checks [checkcnt - 1] = w;
1298} 1412}
1299 1413
1300void 1414void
1301ev_check_stop (EV_P_ struct ev_check *w) 1415ev_check_stop (EV_P_ struct ev_check *w)
… …
1322 return; 1436 return;
1323 1437
1324 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1438 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1325 1439
1326 ev_start (EV_A_ (W)w, 1); 1440 ev_start (EV_A_ (W)w, 1);
1327 array_needsize (signals, signalmax, w->signum, signals_init); 1441 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1328 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1442 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1329 1443
1330 if (!((WL)w)->next) 1444 if (!((WL)w)->next)
1331 { 1445 {
1332#if WIN32 1446#if WIN32
… …
1395 void (*cb)(int revents, void *arg) = once->cb; 1509 void (*cb)(int revents, void *arg) = once->cb;
1396 void *arg = once->arg; 1510 void *arg = once->arg;
1397 1511
1398 ev_io_stop (EV_A_ &once->io); 1512 ev_io_stop (EV_A_ &once->io);
1399 ev_timer_stop (EV_A_ &once->to); 1513 ev_timer_stop (EV_A_ &once->to);
1400 free (once); 1514 ev_free (once);
1401 1515
1402 cb (revents, arg); 1516 cb (revents, arg);
1403} 1517}
1404 1518
1405static void 1519static void
… …
1415} 1529}
1416 1530
1417void 1531void
1418ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1532ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1419{ 1533{
1420 struct ev_once *once = malloc (sizeof (struct ev_once)); 1534 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1421 1535
1422 if (!once) 1536 if (!once)
1423 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1537 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1424 else 1538 else
1425 { 1539 {

Diff Legend

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