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

Comparing libev/ev.c (file contents):
Revision 1.63 by root, Sun Nov 4 22:03:17 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
153#include "ev_win32.c"
154
150/*****************************************************************************/ 155/*****************************************************************************/
151 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
152typedef struct 205typedef struct
153{ 206{
154 struct ev_watcher_list *head; 207 WL head;
155 unsigned char events; 208 unsigned char events;
156 unsigned char reify; 209 unsigned char reify;
157} ANFD; 210} ANFD;
158 211
159typedef struct 212typedef struct
… …
215ev_now (EV_P) 268ev_now (EV_P)
216{ 269{
217 return rt_now; 270 return rt_now;
218} 271}
219 272
220#define array_roundsize(base,n) ((n) | 4 & ~3) 273#define array_roundsize(type,n) ((n) | 4 & ~3)
221 274
222#define array_needsize(base,cur,cnt,init) \ 275#define array_needsize(type,base,cur,cnt,init) \
223 if (expect_false ((cnt) > cur)) \ 276 if (expect_false ((cnt) > cur)) \
224 { \ 277 { \
225 int newcnt = cur; \ 278 int newcnt = cur; \
226 do \ 279 do \
227 { \ 280 { \
228 newcnt = array_roundsize (base, newcnt << 1); \ 281 newcnt = array_roundsize (type, newcnt << 1); \
229 } \ 282 } \
230 while ((cnt) > newcnt); \ 283 while ((cnt) > newcnt); \
231 \ 284 \
232 base = realloc (base, sizeof (*base) * (newcnt)); \ 285 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
233 init (base + cur, newcnt - cur); \ 286 init (base + cur, newcnt - cur); \
234 cur = newcnt; \ 287 cur = newcnt; \
235 } 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;
236 305
237/*****************************************************************************/ 306/*****************************************************************************/
238 307
239static void 308static void
240anfds_init (ANFD *base, int count) 309anfds_init (ANFD *base, int count)
… …
257 pendings [ABSPRI (w)][w->pending - 1].events |= events; 326 pendings [ABSPRI (w)][w->pending - 1].events |= events;
258 return; 327 return;
259 } 328 }
260 329
261 w->pending = ++pendingcnt [ABSPRI (w)]; 330 w->pending = ++pendingcnt [ABSPRI (w)];
262 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));
263 pendings [ABSPRI (w)][w->pending - 1].w = w; 332 pendings [ABSPRI (w)][w->pending - 1].w = w;
264 pendings [ABSPRI (w)][w->pending - 1].events = events; 333 pendings [ABSPRI (w)][w->pending - 1].events = events;
265} 334}
266 335
267static void 336static void
… …
306 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)
307 events |= w->events; 376 events |= w->events;
308 377
309 anfd->reify = 0; 378 anfd->reify = 0;
310 379
311 if (anfd->events != events)
312 {
313 method_modify (EV_A_ fd, anfd->events, events); 380 method_modify (EV_A_ fd, anfd->events, events);
314 anfd->events = events; 381 anfd->events = events;
315 }
316 } 382 }
317 383
318 fdchangecnt = 0; 384 fdchangecnt = 0;
319} 385}
320 386
321static void 387static void
322fd_change (EV_P_ int fd) 388fd_change (EV_P_ int fd)
323{ 389{
324 if (anfds [fd].reify || fdchangecnt < 0) 390 if (anfds [fd].reify)
325 return; 391 return;
326 392
327 anfds [fd].reify = 1; 393 anfds [fd].reify = 1;
328 394
329 ++fdchangecnt; 395 ++fdchangecnt;
330 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 396 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
331 fdchanges [fdchangecnt - 1] = fd; 397 fdchanges [fdchangecnt - 1] = fd;
332} 398}
333 399
334static void 400static void
335fd_kill (EV_P_ int fd) 401fd_kill (EV_P_ int fd)
… …
341 ev_io_stop (EV_A_ w); 407 ev_io_stop (EV_A_ w);
342 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 408 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
343 } 409 }
344} 410}
345 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
346/* called on EBADF to verify fds */ 422/* called on EBADF to verify fds */
347static void 423static void
348fd_ebadf (EV_P) 424fd_ebadf (EV_P)
349{ 425{
350 int fd; 426 int fd;
351 427
352 for (fd = 0; fd < anfdmax; ++fd) 428 for (fd = 0; fd < anfdmax; ++fd)
353 if (anfds [fd].events) 429 if (anfds [fd].events)
354 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 430 if (!fd_valid (fd) == -1 && errno == EBADF)
355 fd_kill (EV_A_ fd); 431 fd_kill (EV_A_ fd);
356} 432}
357 433
358/* 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 */
359static void 435static void
… …
362 int fd; 438 int fd;
363 439
364 for (fd = anfdmax; fd--; ) 440 for (fd = anfdmax; fd--; )
365 if (anfds [fd].events) 441 if (anfds [fd].events)
366 { 442 {
367 close (fd);
368 fd_kill (EV_A_ fd); 443 fd_kill (EV_A_ fd);
369 return; 444 return;
370 } 445 }
371} 446}
372 447
373/* 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 */
374static void 449static void
375fd_rearm_all (EV_P) 450fd_rearm_all (EV_P)
376{ 451{
377 int fd; 452 int fd;
378 453
… …
430 505
431/*****************************************************************************/ 506/*****************************************************************************/
432 507
433typedef struct 508typedef struct
434{ 509{
435 struct ev_watcher_list *head; 510 WL head;
436 sig_atomic_t volatile gotsig; 511 sig_atomic_t volatile gotsig;
437} ANSIG; 512} ANSIG;
438 513
439static ANSIG *signals; 514static ANSIG *signals;
440static int signalmax; 515static int signalmax;
… …
456} 531}
457 532
458static void 533static void
459sighandler (int signum) 534sighandler (int signum)
460{ 535{
536#if WIN32
537 signal (signum, sighandler);
538#endif
539
461 signals [signum - 1].gotsig = 1; 540 signals [signum - 1].gotsig = 1;
462 541
463 if (!gotsig) 542 if (!gotsig)
464 { 543 {
465 int old_errno = errno; 544 int old_errno = errno;
466 gotsig = 1; 545 gotsig = 1;
546#ifdef WIN32
547 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
548#else
467 write (sigpipe [1], &signum, 1); 549 write (sigpipe [1], &signum, 1);
550#endif
468 errno = old_errno; 551 errno = old_errno;
469 } 552 }
470} 553}
471 554
472static void 555static void
473sigcb (EV_P_ struct ev_io *iow, int revents) 556sigcb (EV_P_ struct ev_io *iow, int revents)
474{ 557{
475 struct ev_watcher_list *w; 558 WL w;
476 int signum; 559 int signum;
477 560
561#ifdef WIN32
562 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
563#else
478 read (sigpipe [0], &revents, 1); 564 read (sigpipe [0], &revents, 1);
565#endif
479 gotsig = 0; 566 gotsig = 0;
480 567
481 for (signum = signalmax; signum--; ) 568 for (signum = signalmax; signum--; )
482 if (signals [signum].gotsig) 569 if (signals [signum].gotsig)
483 { 570 {
… …
505 ev_unref (EV_A); /* child watcher should not keep loop alive */ 592 ev_unref (EV_A); /* child watcher should not keep loop alive */
506} 593}
507 594
508/*****************************************************************************/ 595/*****************************************************************************/
509 596
597static struct ev_child *childs [PID_HASHSIZE];
598
510#ifndef WIN32 599#ifndef WIN32
511 600
512static struct ev_child *childs [PID_HASHSIZE];
513static struct ev_signal childev; 601static struct ev_signal childev;
514 602
515#ifndef WCONTINUED 603#ifndef WCONTINUED
516# define WCONTINUED 0 604# define WCONTINUED 0
517#endif 605#endif
… …
631 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 719 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
632#endif 720#endif
633#if EV_USE_SELECT 721#if EV_USE_SELECT
634 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 722 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
635#endif 723#endif
724
725 ev_watcher_init (&sigev, sigcb);
726 ev_set_priority (&sigev, EV_MAXPRI);
636 } 727 }
637} 728}
638 729
639void 730void
640loop_destroy (EV_P) 731loop_destroy (EV_P)
641{ 732{
733 int i;
734
642#if EV_USE_WIN32 735#if EV_USE_WIN32
643 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 736 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
644#endif 737#endif
645#if EV_USE_KQUEUE 738#if EV_USE_KQUEUE
646 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 739 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
… …
653#endif 746#endif
654#if EV_USE_SELECT 747#if EV_USE_SELECT
655 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 748 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
656#endif 749#endif
657 750
751 for (i = NUMPRI; i--; )
752 array_free (pending, [i]);
753
754 /* have to use the microsoft-never-gets-it-right macro */
755 array_free_microshit (fdchange);
756 array_free_microshit (timer);
757 array_free_microshit (periodic);
758 array_free_microshit (idle);
759 array_free_microshit (prepare);
760 array_free_microshit (check);
761
658 method = 0; 762 method = 0;
659 /*TODO*/
660} 763}
661 764
662void 765static void
663loop_fork (EV_P) 766loop_fork (EV_P)
664{ 767{
665 /*TODO*/
666#if EV_USE_EPOLL 768#if EV_USE_EPOLL
667 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 769 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
668#endif 770#endif
669#if EV_USE_KQUEUE 771#if EV_USE_KQUEUE
670 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 772 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
671#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;
672} 791}
673 792
674#if EV_MULTIPLICITY 793#if EV_MULTIPLICITY
675struct ev_loop * 794struct ev_loop *
676ev_loop_new (int methods) 795ev_loop_new (int methods)
677{ 796{
678 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));
679 800
680 loop_init (EV_A_ methods); 801 loop_init (EV_A_ methods);
681 802
682 if (ev_method (EV_A)) 803 if (ev_method (EV_A))
683 return loop; 804 return loop;
… …
687 808
688void 809void
689ev_loop_destroy (EV_P) 810ev_loop_destroy (EV_P)
690{ 811{
691 loop_destroy (EV_A); 812 loop_destroy (EV_A);
692 free (loop); 813 ev_free (loop);
693} 814}
694 815
695void 816void
696ev_loop_fork (EV_P) 817ev_loop_fork (EV_P)
697{ 818{
698 loop_fork (EV_A); 819 postfork = 1;
699} 820}
700 821
701#endif 822#endif
702 823
703#if EV_MULTIPLICITY 824#if EV_MULTIPLICITY
… …
726 847
727 loop_init (EV_A_ methods); 848 loop_init (EV_A_ methods);
728 849
729 if (ev_method (EV_A)) 850 if (ev_method (EV_A))
730 { 851 {
731 ev_watcher_init (&sigev, sigcb);
732 ev_set_priority (&sigev, EV_MAXPRI);
733 siginit (EV_A); 852 siginit (EV_A);
734 853
735#ifndef WIN32 854#ifndef WIN32
736 ev_signal_init (&childev, childcb, SIGCHLD); 855 ev_signal_init (&childev, childcb, SIGCHLD);
737 ev_set_priority (&childev, EV_MAXPRI); 856 ev_set_priority (&childev, EV_MAXPRI);
… …
751{ 870{
752#if EV_MULTIPLICITY 871#if EV_MULTIPLICITY
753 struct ev_loop *loop = default_loop; 872 struct ev_loop *loop = default_loop;
754#endif 873#endif
755 874
875#ifndef WIN32
756 ev_ref (EV_A); /* child watcher */ 876 ev_ref (EV_A); /* child watcher */
757 ev_signal_stop (EV_A_ &childev); 877 ev_signal_stop (EV_A_ &childev);
878#endif
758 879
759 ev_ref (EV_A); /* signal watcher */ 880 ev_ref (EV_A); /* signal watcher */
760 ev_io_stop (EV_A_ &sigev); 881 ev_io_stop (EV_A_ &sigev);
761 882
762 close (sigpipe [0]); sigpipe [0] = 0; 883 close (sigpipe [0]); sigpipe [0] = 0;
… …
770{ 891{
771#if EV_MULTIPLICITY 892#if EV_MULTIPLICITY
772 struct ev_loop *loop = default_loop; 893 struct ev_loop *loop = default_loop;
773#endif 894#endif
774 895
775 loop_fork (EV_A); 896 if (method)
776 897 postfork = 1;
777 ev_io_stop (EV_A_ &sigev);
778 close (sigpipe [0]);
779 close (sigpipe [1]);
780 pipe (sigpipe);
781
782 ev_ref (EV_A); /* signal watcher */
783 siginit (EV_A);
784} 898}
785 899
786/*****************************************************************************/ 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}
787 913
788static void 914static void
789call_pending (EV_P) 915call_pending (EV_P)
790{ 916{
791 int pri; 917 int pri;
… …
796 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 922 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
797 923
798 if (p->w) 924 if (p->w)
799 { 925 {
800 p->w->pending = 0; 926 p->w->pending = 0;
801
802 (*(void (**)(EV_P_ W, int))&p->w->cb) (EV_A_ p->w, p->events); 927 p->w->cb (EV_A_ p->w, p->events);
803 } 928 }
804 } 929 }
805} 930}
806 931
807static void 932static void
… …
835 struct ev_periodic *w = periodics [0]; 960 struct ev_periodic *w = periodics [0];
836 961
837 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 962 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
838 963
839 /* 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 }
840 if (w->interval) 972 else if (w->interval)
841 { 973 {
842 ((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;
843 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));
844 downheap ((WT *)periodics, periodiccnt, 0); 976 downheap ((WT *)periodics, periodiccnt, 0);
845 } 977 }
… …
858 /* adjust periodics after time jump */ 990 /* adjust periodics after time jump */
859 for (i = 0; i < periodiccnt; ++i) 991 for (i = 0; i < periodiccnt; ++i)
860 { 992 {
861 struct ev_periodic *w = periodics [i]; 993 struct ev_periodic *w = periodics [i];
862 994
995 if (w->reschedule_cb)
996 ((WT)w)->at = w->reschedule_cb (w, rt_now);
863 if (w->interval) 997 else if (w->interval)
864 {
865 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;
866
867 if (fabs (diff) >= 1e-4)
868 {
869 ev_periodic_stop (EV_A_ w);
870 ev_periodic_start (EV_A_ w);
871
872 i = 0; /* restart loop, inefficient, but time jumps should be rare */
873 }
874 }
875 } 999 }
1000
1001 /* now rebuild the heap */
1002 for (i = periodiccnt >> 1; i--; )
1003 downheap ((WT *)periodics, periodiccnt, i);
876} 1004}
877 1005
878inline int 1006inline int
879time_update_monotonic (EV_P) 1007time_update_monotonic (EV_P)
880{ 1008{
… …
967 { 1095 {
968 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1096 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
969 call_pending (EV_A); 1097 call_pending (EV_A);
970 } 1098 }
971 1099
1100 /* we might have forked, so reify kernel state if necessary */
1101 if (expect_false (postfork))
1102 loop_fork (EV_A);
1103
972 /* update fd-related kernel structures */ 1104 /* update fd-related kernel structures */
973 fd_reify (EV_A); 1105 fd_reify (EV_A);
974 1106
975 /* calculate blocking time */ 1107 /* calculate blocking time */
976 1108
977 /* 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
978 always have timers, we just calculate it always */ 1110 always have timers, we just calculate it always */
979#if EV_USE_MONOTONIC 1111#if EV_USE_MONOTONIC
980 if (expect_true (have_monotonic)) 1112 if (expect_true (have_monotonic))
981 time_update_monotonic (EV_A); 1113 time_update_monotonic (EV_A);
982 else 1114 else
… …
1015 /* queue pending timers and reschedule them */ 1147 /* queue pending timers and reschedule them */
1016 timers_reify (EV_A); /* relative timers called last */ 1148 timers_reify (EV_A); /* relative timers called last */
1017 periodics_reify (EV_A); /* absolute timers called first */ 1149 periodics_reify (EV_A); /* absolute timers called first */
1018 1150
1019 /* queue idle watchers unless io or timers are pending */ 1151 /* queue idle watchers unless io or timers are pending */
1020 if (!pendingcnt) 1152 if (idlecnt && !any_pending (EV_A))
1021 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1153 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1022 1154
1023 /* queue check watchers, to be executed first */ 1155 /* queue check watchers, to be executed first */
1024 if (checkcnt) 1156 if (checkcnt)
1025 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1157 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1100 return; 1232 return;
1101 1233
1102 assert (("ev_io_start called with negative fd", fd >= 0)); 1234 assert (("ev_io_start called with negative fd", fd >= 0));
1103 1235
1104 ev_start (EV_A_ (W)w, 1); 1236 ev_start (EV_A_ (W)w, 1);
1105 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1237 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1106 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1238 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1107 1239
1108 fd_change (EV_A_ fd); 1240 fd_change (EV_A_ fd);
1109} 1241}
1110 1242
… …
1130 ((WT)w)->at += mn_now; 1262 ((WT)w)->at += mn_now;
1131 1263
1132 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.));
1133 1265
1134 ev_start (EV_A_ (W)w, ++timercnt); 1266 ev_start (EV_A_ (W)w, ++timercnt);
1135 array_needsize (timers, timermax, timercnt, ); 1267 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1136 timers [timercnt - 1] = w; 1268 timers [timercnt - 1] = w;
1137 upheap ((WT *)timers, timercnt - 1); 1269 upheap ((WT *)timers, timercnt - 1);
1138 1270
1139 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1271 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1140} 1272}
… …
1180ev_periodic_start (EV_P_ struct ev_periodic *w) 1312ev_periodic_start (EV_P_ struct ev_periodic *w)
1181{ 1313{
1182 if (ev_is_active (w)) 1314 if (ev_is_active (w))
1183 return; 1315 return;
1184 1316
1317 if (w->reschedule_cb)
1318 ((WT)w)->at = w->reschedule_cb (w, rt_now);
1319 else if (w->interval)
1320 {
1185 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.));
1186
1187 /* 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 */
1188 if (w->interval)
1189 ((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 }
1190 1325
1191 ev_start (EV_A_ (W)w, ++periodiccnt); 1326 ev_start (EV_A_ (W)w, ++periodiccnt);
1192 array_needsize (periodics, periodicmax, periodiccnt, ); 1327 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1193 periodics [periodiccnt - 1] = w; 1328 periodics [periodiccnt - 1] = w;
1194 upheap ((WT *)periodics, periodiccnt - 1); 1329 upheap ((WT *)periodics, periodiccnt - 1);
1195 1330
1196 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1331 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1197} 1332}
… …
1213 1348
1214 ev_stop (EV_A_ (W)w); 1349 ev_stop (EV_A_ (W)w);
1215} 1350}
1216 1351
1217void 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
1218ev_idle_start (EV_P_ struct ev_idle *w) 1360ev_idle_start (EV_P_ struct ev_idle *w)
1219{ 1361{
1220 if (ev_is_active (w)) 1362 if (ev_is_active (w))
1221 return; 1363 return;
1222 1364
1223 ev_start (EV_A_ (W)w, ++idlecnt); 1365 ev_start (EV_A_ (W)w, ++idlecnt);
1224 array_needsize (idles, idlemax, idlecnt, ); 1366 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1225 idles [idlecnt - 1] = w; 1367 idles [idlecnt - 1] = w;
1226} 1368}
1227 1369
1228void 1370void
1229ev_idle_stop (EV_P_ struct ev_idle *w) 1371ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1241{ 1383{
1242 if (ev_is_active (w)) 1384 if (ev_is_active (w))
1243 return; 1385 return;
1244 1386
1245 ev_start (EV_A_ (W)w, ++preparecnt); 1387 ev_start (EV_A_ (W)w, ++preparecnt);
1246 array_needsize (prepares, preparemax, preparecnt, ); 1388 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1247 prepares [preparecnt - 1] = w; 1389 prepares [preparecnt - 1] = w;
1248} 1390}
1249 1391
1250void 1392void
1251ev_prepare_stop (EV_P_ struct ev_prepare *w) 1393ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1263{ 1405{
1264 if (ev_is_active (w)) 1406 if (ev_is_active (w))
1265 return; 1407 return;
1266 1408
1267 ev_start (EV_A_ (W)w, ++checkcnt); 1409 ev_start (EV_A_ (W)w, ++checkcnt);
1268 array_needsize (checks, checkmax, checkcnt, ); 1410 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1269 checks [checkcnt - 1] = w; 1411 checks [checkcnt - 1] = w;
1270} 1412}
1271 1413
1272void 1414void
1273ev_check_stop (EV_P_ struct ev_check *w) 1415ev_check_stop (EV_P_ struct ev_check *w)
… …
1294 return; 1436 return;
1295 1437
1296 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));
1297 1439
1298 ev_start (EV_A_ (W)w, 1); 1440 ev_start (EV_A_ (W)w, 1);
1299 array_needsize (signals, signalmax, w->signum, signals_init); 1441 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1300 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1442 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1301 1443
1302 if (!((WL)w)->next) 1444 if (!((WL)w)->next)
1303 { 1445 {
1446#if WIN32
1447 signal (w->signum, sighandler);
1448#else
1304 struct sigaction sa; 1449 struct sigaction sa;
1305 sa.sa_handler = sighandler; 1450 sa.sa_handler = sighandler;
1306 sigfillset (&sa.sa_mask); 1451 sigfillset (&sa.sa_mask);
1307 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1452 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1308 sigaction (w->signum, &sa, 0); 1453 sigaction (w->signum, &sa, 0);
1454#endif
1309 } 1455 }
1310} 1456}
1311 1457
1312void 1458void
1313ev_signal_stop (EV_P_ struct ev_signal *w) 1459ev_signal_stop (EV_P_ struct ev_signal *w)
… …
1363 void (*cb)(int revents, void *arg) = once->cb; 1509 void (*cb)(int revents, void *arg) = once->cb;
1364 void *arg = once->arg; 1510 void *arg = once->arg;
1365 1511
1366 ev_io_stop (EV_A_ &once->io); 1512 ev_io_stop (EV_A_ &once->io);
1367 ev_timer_stop (EV_A_ &once->to); 1513 ev_timer_stop (EV_A_ &once->to);
1368 free (once); 1514 ev_free (once);
1369 1515
1370 cb (revents, arg); 1516 cb (revents, arg);
1371} 1517}
1372 1518
1373static void 1519static void
… …
1383} 1529}
1384 1530
1385void 1531void
1386ev_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)
1387{ 1533{
1388 struct ev_once *once = malloc (sizeof (struct ev_once)); 1534 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1389 1535
1390 if (!once) 1536 if (!once)
1391 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1537 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1392 else 1538 else
1393 { 1539 {

Diff Legend

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