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

Comparing libev/ev.c (file contents):
Revision 1.86 by root, Sat Nov 10 03:19:21 2007 UTC vs.
Revision 1.106 by root, Mon Nov 12 01:07:50 2007 UTC

… …
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
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
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
32# include "config.h" 37# include "config.h"
33 38
34# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif
43# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif
37# endif 46# endif
38 47
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
40# define EV_USE_SELECT 1 49# define EV_USE_SELECT 1
41# endif 50# endif
42 51
43# if HAVE_POLL && HAVE_POLL_H 52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
44# define EV_USE_POLL 1 53# define EV_USE_POLL 1
45# endif 54# endif
46 55
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
48# define EV_USE_EPOLL 1 57# define EV_USE_EPOLL 1
49# endif 58# endif
50 59
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
52# define EV_USE_KQUEUE 1 61# define EV_USE_KQUEUE 1
53# endif 62# endif
54 63
55#endif 64#endif
56 65
… …
66#include <sys/types.h> 75#include <sys/types.h>
67#include <time.h> 76#include <time.h>
68 77
69#include <signal.h> 78#include <signal.h>
70 79
71#ifndef WIN32 80#ifndef _WIN32
72# include <unistd.h> 81# include <unistd.h>
73# include <sys/time.h> 82# include <sys/time.h>
74# include <sys/wait.h> 83# include <sys/wait.h>
84#else
85# define WIN32_LEAN_AND_MEAN
86# include <windows.h>
87# ifndef EV_SELECT_IS_WINSOCKET
88# define EV_SELECT_IS_WINSOCKET 1
75#endif 89# endif
90#endif
91
76/**/ 92/**/
77 93
78#ifndef EV_USE_MONOTONIC 94#ifndef EV_USE_MONOTONIC
79# define EV_USE_MONOTONIC 1 95# define EV_USE_MONOTONIC 1
80#endif 96#endif
81 97
82#ifndef EV_USE_SELECT 98#ifndef EV_USE_SELECT
83# define EV_USE_SELECT 1 99# define EV_USE_SELECT 1
100# define EV_SELECT_USE_FD_SET 1
84#endif 101#endif
85 102
86#ifndef EV_USE_POLL 103#ifndef EV_USE_POLL
87# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 104# ifdef _WIN32
105# define EV_USE_POLL 0
106# else
107# define EV_USE_POLL 1
108# endif
88#endif 109#endif
89 110
90#ifndef EV_USE_EPOLL 111#ifndef EV_USE_EPOLL
91# define EV_USE_EPOLL 0 112# define EV_USE_EPOLL 0
92#endif 113#endif
93 114
94#ifndef EV_USE_KQUEUE 115#ifndef EV_USE_KQUEUE
95# define EV_USE_KQUEUE 0 116# define EV_USE_KQUEUE 0
96#endif 117#endif
97 118
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
106#endif
107
108#ifndef EV_USE_REALTIME 119#ifndef EV_USE_REALTIME
109# define EV_USE_REALTIME 1 120# define EV_USE_REALTIME 1
110#endif 121#endif
111 122
112/**/ 123/**/
124
125/* darwin simply cnanot be helped */
126#ifdef __APPLE__
127# undef EV_USE_POLL
128# undef EV_USE_KQUEUE
129#endif
113 130
114#ifndef CLOCK_MONOTONIC 131#ifndef CLOCK_MONOTONIC
115# undef EV_USE_MONOTONIC 132# undef EV_USE_MONOTONIC
116# define EV_USE_MONOTONIC 0 133# define EV_USE_MONOTONIC 0
117#endif 134#endif
118 135
119#ifndef CLOCK_REALTIME 136#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 137# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 138# define EV_USE_REALTIME 0
139#endif
140
141#if EV_SELECT_IS_WINSOCKET
142# include <winsock.h>
122#endif 143#endif
123 144
124/**/ 145/**/
125 146
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 147#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
… …
146#define expect_true(expr) expect ((expr) != 0, 1) 167#define expect_true(expr) expect ((expr) != 0, 1)
147 168
148#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 169#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
149#define ABSPRI(w) ((w)->priority - EV_MINPRI) 170#define ABSPRI(w) ((w)->priority - EV_MINPRI)
150 171
172#define EMPTY /* required for microsofts broken pseudo-c compiler */
173
151typedef struct ev_watcher *W; 174typedef struct ev_watcher *W;
152typedef struct ev_watcher_list *WL; 175typedef struct ev_watcher_list *WL;
153typedef struct ev_watcher_time *WT; 176typedef struct ev_watcher_time *WT;
154 177
155static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 178static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
156 179
180#ifdef _WIN32
157#include "ev_win32.c" 181# include "ev_win32.c"
182#endif
158 183
159/*****************************************************************************/ 184/*****************************************************************************/
160 185
161static void (*syserr_cb)(const char *msg); 186static void (*syserr_cb)(const char *msg);
162 187
… …
209typedef struct 234typedef struct
210{ 235{
211 WL head; 236 WL head;
212 unsigned char events; 237 unsigned char events;
213 unsigned char reify; 238 unsigned char reify;
239#if EV_SELECT_IS_WINSOCKET
240 SOCKET handle;
241#endif
214} ANFD; 242} ANFD;
215 243
216typedef struct 244typedef struct
217{ 245{
218 W w; 246 W w;
… …
222#if EV_MULTIPLICITY 250#if EV_MULTIPLICITY
223 251
224 struct ev_loop 252 struct ev_loop
225 { 253 {
226 ev_tstamp ev_rt_now; 254 ev_tstamp ev_rt_now;
255 #define ev_rt_now ((loop)->ev_rt_now)
227 #define VAR(name,decl) decl; 256 #define VAR(name,decl) decl;
228 #include "ev_vars.h" 257 #include "ev_vars.h"
229 #undef VAR 258 #undef VAR
230 }; 259 };
231 #include "ev_wrap.h" 260 #include "ev_wrap.h"
… …
244 273
245#endif 274#endif
246 275
247/*****************************************************************************/ 276/*****************************************************************************/
248 277
249inline ev_tstamp 278ev_tstamp
250ev_time (void) 279ev_time (void)
251{ 280{
252#if EV_USE_REALTIME 281#if EV_USE_REALTIME
253 struct timespec ts; 282 struct timespec ts;
254 clock_gettime (CLOCK_REALTIME, &ts); 283 clock_gettime (CLOCK_REALTIME, &ts);
… …
306 stem ## max = array_roundsize (stem ## cnt >> 1); \ 335 stem ## max = array_roundsize (stem ## cnt >> 1); \
307 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 336 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
308 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 337 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
309 } 338 }
310 339
311/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
312/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
313#define array_free_microshit(stem) \
314 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
315
316#define array_free(stem, idx) \ 340#define array_free(stem, idx) \
317 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 341 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
318 342
319/*****************************************************************************/ 343/*****************************************************************************/
320 344
… …
394 int events = 0; 418 int events = 0;
395 419
396 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 420 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
397 events |= w->events; 421 events |= w->events;
398 422
423#if EV_SELECT_IS_WINSOCKET
424 if (events)
425 {
426 unsigned long argp;
427 anfd->handle = _get_osfhandle (fd);
428 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
429 }
430#endif
431
399 anfd->reify = 0; 432 anfd->reify = 0;
400 433
401 method_modify (EV_A_ fd, anfd->events, events); 434 method_modify (EV_A_ fd, anfd->events, events);
402 anfd->events = events; 435 anfd->events = events;
403 } 436 }
… …
431} 464}
432 465
433static int 466static int
434fd_valid (int fd) 467fd_valid (int fd)
435{ 468{
436#ifdef WIN32 469#ifdef _WIN32
437 return !!win32_get_osfhandle (fd); 470 return _get_osfhandle (fd) != -1;
438#else 471#else
439 return fcntl (fd, F_GETFD) != -1; 472 return fcntl (fd, F_GETFD) != -1;
440#endif 473#endif
441} 474}
442 475
… …
523 heap [k] = w; 556 heap [k] = w;
524 ((W)heap [k])->active = k + 1; 557 ((W)heap [k])->active = k + 1;
525} 558}
526 559
527inline void 560inline void
528adjustheap (WT *heap, int N, int k, ev_tstamp at) 561adjustheap (WT *heap, int N, int k)
529{ 562{
530 ev_tstamp old_at = heap [k]->at; 563 upheap (heap, k);
531 heap [k]->at = at;
532
533 if (old_at < at)
534 downheap (heap, N, k); 564 downheap (heap, N, k);
535 else
536 upheap (heap, k);
537} 565}
538 566
539/*****************************************************************************/ 567/*****************************************************************************/
540 568
541typedef struct 569typedef struct
… …
564} 592}
565 593
566static void 594static void
567sighandler (int signum) 595sighandler (int signum)
568{ 596{
569#if WIN32 597#if _WIN32
570 signal (signum, sighandler); 598 signal (signum, sighandler);
571#endif 599#endif
572 600
573 signals [signum - 1].gotsig = 1; 601 signals [signum - 1].gotsig = 1;
574 602
575 if (!gotsig) 603 if (!gotsig)
576 { 604 {
577 int old_errno = errno; 605 int old_errno = errno;
578 gotsig = 1; 606 gotsig = 1;
579#ifdef WIN32
580 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
581#else
582 write (sigpipe [1], &signum, 1); 607 write (sigpipe [1], &signum, 1);
583#endif
584 errno = old_errno; 608 errno = old_errno;
585 } 609 }
586} 610}
587 611
588void 612void
… …
608static void 632static void
609sigcb (EV_P_ struct ev_io *iow, int revents) 633sigcb (EV_P_ struct ev_io *iow, int revents)
610{ 634{
611 int signum; 635 int signum;
612 636
613#ifdef WIN32
614 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
615#else
616 read (sigpipe [0], &revents, 1); 637 read (sigpipe [0], &revents, 1);
617#endif
618 gotsig = 0; 638 gotsig = 0;
619 639
620 for (signum = signalmax; signum--; ) 640 for (signum = signalmax; signum--; )
621 if (signals [signum].gotsig) 641 if (signals [signum].gotsig)
622 ev_feed_signal_event (EV_A_ signum + 1); 642 ev_feed_signal_event (EV_A_ signum + 1);
623} 643}
624 644
645inline void
646fd_intern (int fd)
647{
648#ifdef _WIN32
649 int arg = 1;
650 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
651#else
652 fcntl (fd, F_SETFD, FD_CLOEXEC);
653 fcntl (fd, F_SETFL, O_NONBLOCK);
654#endif
655}
656
625static void 657static void
626siginit (EV_P) 658siginit (EV_P)
627{ 659{
628#ifndef WIN32 660 fd_intern (sigpipe [0]);
629 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 661 fd_intern (sigpipe [1]);
630 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
631
632 /* rather than sort out wether we really need nb, set it */
633 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
634 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
635#endif
636 662
637 ev_io_set (&sigev, sigpipe [0], EV_READ); 663 ev_io_set (&sigev, sigpipe [0], EV_READ);
638 ev_io_start (EV_A_ &sigev); 664 ev_io_start (EV_A_ &sigev);
639 ev_unref (EV_A); /* child watcher should not keep loop alive */ 665 ev_unref (EV_A); /* child watcher should not keep loop alive */
640} 666}
641 667
642/*****************************************************************************/ 668/*****************************************************************************/
643 669
644static struct ev_child *childs [PID_HASHSIZE]; 670static struct ev_child *childs [PID_HASHSIZE];
645 671
646#ifndef WIN32 672#ifndef _WIN32
647 673
648static struct ev_signal childev; 674static struct ev_signal childev;
649 675
650#ifndef WCONTINUED 676#ifndef WCONTINUED
651# define WCONTINUED 0 677# define WCONTINUED 0
… …
712 738
713/* return true if we are running with elevated privileges and should ignore env variables */ 739/* return true if we are running with elevated privileges and should ignore env variables */
714static int 740static int
715enable_secure (void) 741enable_secure (void)
716{ 742{
717#ifdef WIN32 743#ifdef _WIN32
718 return 0; 744 return 0;
719#else 745#else
720 return getuid () != geteuid () 746 return getuid () != geteuid ()
721 || getgid () != getegid (); 747 || getgid () != getegid ();
722#endif 748#endif
… …
751 methods = atoi (getenv ("LIBEV_METHODS")); 777 methods = atoi (getenv ("LIBEV_METHODS"));
752 else 778 else
753 methods = EVMETHOD_ANY; 779 methods = EVMETHOD_ANY;
754 780
755 method = 0; 781 method = 0;
756#if EV_USE_WIN32
757 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
758#endif
759#if EV_USE_KQUEUE 782#if EV_USE_KQUEUE
760 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 783 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
761#endif 784#endif
762#if EV_USE_EPOLL 785#if EV_USE_EPOLL
763 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 786 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
… …
777void 800void
778loop_destroy (EV_P) 801loop_destroy (EV_P)
779{ 802{
780 int i; 803 int i;
781 804
782#if EV_USE_WIN32
783 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
784#endif
785#if EV_USE_KQUEUE 805#if EV_USE_KQUEUE
786 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 806 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
787#endif 807#endif
788#if EV_USE_EPOLL 808#if EV_USE_EPOLL
789 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 809 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
797 817
798 for (i = NUMPRI; i--; ) 818 for (i = NUMPRI; i--; )
799 array_free (pending, [i]); 819 array_free (pending, [i]);
800 820
801 /* have to use the microsoft-never-gets-it-right macro */ 821 /* have to use the microsoft-never-gets-it-right macro */
802 array_free_microshit (fdchange); 822 array_free (fdchange, EMPTY);
803 array_free_microshit (timer); 823 array_free (timer, EMPTY);
804 array_free_microshit (periodic); 824#if EV_PERIODICS
805 array_free_microshit (idle); 825 array_free (periodic, EMPTY);
806 array_free_microshit (prepare); 826#endif
807 array_free_microshit (check); 827 array_free (idle, EMPTY);
828 array_free (prepare, EMPTY);
829 array_free (check, EMPTY);
808 830
809 method = 0; 831 method = 0;
810} 832}
811 833
812static void 834static void
… …
891 913
892 if (ev_method (EV_A)) 914 if (ev_method (EV_A))
893 { 915 {
894 siginit (EV_A); 916 siginit (EV_A);
895 917
896#ifndef WIN32 918#ifndef _WIN32
897 ev_signal_init (&childev, childcb, SIGCHLD); 919 ev_signal_init (&childev, childcb, SIGCHLD);
898 ev_set_priority (&childev, EV_MAXPRI); 920 ev_set_priority (&childev, EV_MAXPRI);
899 ev_signal_start (EV_A_ &childev); 921 ev_signal_start (EV_A_ &childev);
900 ev_unref (EV_A); /* child watcher should not keep loop alive */ 922 ev_unref (EV_A); /* child watcher should not keep loop alive */
901#endif 923#endif
… …
912{ 934{
913#if EV_MULTIPLICITY 935#if EV_MULTIPLICITY
914 struct ev_loop *loop = default_loop; 936 struct ev_loop *loop = default_loop;
915#endif 937#endif
916 938
917#ifndef WIN32 939#ifndef _WIN32
918 ev_ref (EV_A); /* child watcher */ 940 ev_ref (EV_A); /* child watcher */
919 ev_signal_stop (EV_A_ &childev); 941 ev_signal_stop (EV_A_ &childev);
920#endif 942#endif
921 943
922 ev_ref (EV_A); /* signal watcher */ 944 ev_ref (EV_A); /* signal watcher */
… …
982 1004
983 /* first reschedule or stop timer */ 1005 /* first reschedule or stop timer */
984 if (w->repeat) 1006 if (w->repeat)
985 { 1007 {
986 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1008 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1009
987 ((WT)w)->at = mn_now + w->repeat; 1010 ((WT)w)->at += w->repeat;
1011 if (((WT)w)->at < mn_now)
1012 ((WT)w)->at = mn_now;
1013
988 downheap ((WT *)timers, timercnt, 0); 1014 downheap ((WT *)timers, timercnt, 0);
989 } 1015 }
990 else 1016 else
991 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1017 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
992 1018
993 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1019 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
994 } 1020 }
995} 1021}
996 1022
1023#if EV_PERIODICS
997static void 1024static void
998periodics_reify (EV_P) 1025periodics_reify (EV_P)
999{ 1026{
1000 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1027 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1001 { 1028 {
… …
1042 1069
1043 /* now rebuild the heap */ 1070 /* now rebuild the heap */
1044 for (i = periodiccnt >> 1; i--; ) 1071 for (i = periodiccnt >> 1; i--; )
1045 downheap ((WT *)periodics, periodiccnt, i); 1072 downheap ((WT *)periodics, periodiccnt, i);
1046} 1073}
1074#endif
1047 1075
1048inline int 1076inline int
1049time_update_monotonic (EV_P) 1077time_update_monotonic (EV_P)
1050{ 1078{
1051 mn_now = get_clock (); 1079 mn_now = get_clock ();
… …
1085 ev_rt_now = ev_time (); 1113 ev_rt_now = ev_time ();
1086 mn_now = get_clock (); 1114 mn_now = get_clock ();
1087 now_floor = mn_now; 1115 now_floor = mn_now;
1088 } 1116 }
1089 1117
1118# if EV_PERIODICS
1090 periodics_reschedule (EV_A); 1119 periodics_reschedule (EV_A);
1120# endif
1091 /* no timer adjustment, as the monotonic clock doesn't jump */ 1121 /* no timer adjustment, as the monotonic clock doesn't jump */
1092 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1122 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1093 } 1123 }
1094 } 1124 }
1095 else 1125 else
… …
1097 { 1127 {
1098 ev_rt_now = ev_time (); 1128 ev_rt_now = ev_time ();
1099 1129
1100 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1130 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1101 { 1131 {
1132#if EV_PERIODICS
1102 periodics_reschedule (EV_A); 1133 periodics_reschedule (EV_A);
1134#endif
1103 1135
1104 /* adjust timers. this is easy, as the offset is the same for all */ 1136 /* adjust timers. this is easy, as the offset is the same for all */
1105 for (i = 0; i < timercnt; ++i) 1137 for (i = 0; i < timercnt; ++i)
1106 ((WT)timers [i])->at += ev_rt_now - mn_now; 1138 ((WT)timers [i])->at += ev_rt_now - mn_now;
1107 } 1139 }
… …
1170 { 1202 {
1171 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1203 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1172 if (block > to) block = to; 1204 if (block > to) block = to;
1173 } 1205 }
1174 1206
1207#if EV_PERIODICS
1175 if (periodiccnt) 1208 if (periodiccnt)
1176 { 1209 {
1177 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1210 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1178 if (block > to) block = to; 1211 if (block > to) block = to;
1179 } 1212 }
1213#endif
1180 1214
1181 if (block < 0.) block = 0.; 1215 if (block < 0.) block = 0.;
1182 } 1216 }
1183 1217
1184 method_poll (EV_A_ block); 1218 method_poll (EV_A_ block);
… …
1186 /* update ev_rt_now, do magic */ 1220 /* update ev_rt_now, do magic */
1187 time_update (EV_A); 1221 time_update (EV_A);
1188 1222
1189 /* queue pending timers and reschedule them */ 1223 /* queue pending timers and reschedule them */
1190 timers_reify (EV_A); /* relative timers called last */ 1224 timers_reify (EV_A); /* relative timers called last */
1225#if EV_PERIODICS
1191 periodics_reify (EV_A); /* absolute timers called first */ 1226 periodics_reify (EV_A); /* absolute timers called first */
1227#endif
1192 1228
1193 /* queue idle watchers unless io or timers are pending */ 1229 /* queue idle watchers unless io or timers are pending */
1194 if (idlecnt && !any_pending (EV_A)) 1230 if (idlecnt && !any_pending (EV_A))
1195 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1231 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1196 1232
… …
1287{ 1323{
1288 ev_clear_pending (EV_A_ (W)w); 1324 ev_clear_pending (EV_A_ (W)w);
1289 if (!ev_is_active (w)) 1325 if (!ev_is_active (w))
1290 return; 1326 return;
1291 1327
1328 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1329
1292 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1330 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1293 ev_stop (EV_A_ (W)w); 1331 ev_stop (EV_A_ (W)w);
1294 1332
1295 fd_change (EV_A_ w->fd); 1333 fd_change (EV_A_ w->fd);
1296} 1334}
… …
1323 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1361 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1324 1362
1325 if (((W)w)->active < timercnt--) 1363 if (((W)w)->active < timercnt--)
1326 { 1364 {
1327 timers [((W)w)->active - 1] = timers [timercnt]; 1365 timers [((W)w)->active - 1] = timers [timercnt];
1328 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1366 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1329 } 1367 }
1330 1368
1331 ((WT)w)->at = w->repeat; 1369 ((WT)w)->at -= mn_now;
1332 1370
1333 ev_stop (EV_A_ (W)w); 1371 ev_stop (EV_A_ (W)w);
1334} 1372}
1335 1373
1336void 1374void
1337ev_timer_again (EV_P_ struct ev_timer *w) 1375ev_timer_again (EV_P_ struct ev_timer *w)
1338{ 1376{
1339 if (ev_is_active (w)) 1377 if (ev_is_active (w))
1340 { 1378 {
1341 if (w->repeat) 1379 if (w->repeat)
1380 {
1381 ((WT)w)->at = mn_now + w->repeat;
1342 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1382 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1383 }
1343 else 1384 else
1344 ev_timer_stop (EV_A_ w); 1385 ev_timer_stop (EV_A_ w);
1345 } 1386 }
1346 else if (w->repeat) 1387 else if (w->repeat)
1347 ev_timer_start (EV_A_ w); 1388 ev_timer_start (EV_A_ w);
1348} 1389}
1349 1390
1391#if EV_PERIODICS
1350void 1392void
1351ev_periodic_start (EV_P_ struct ev_periodic *w) 1393ev_periodic_start (EV_P_ struct ev_periodic *w)
1352{ 1394{
1353 if (ev_is_active (w)) 1395 if (ev_is_active (w))
1354 return; 1396 return;
… …
1380 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1422 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1381 1423
1382 if (((W)w)->active < periodiccnt--) 1424 if (((W)w)->active < periodiccnt--)
1383 { 1425 {
1384 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1426 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1385 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1427 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1386 } 1428 }
1387 1429
1388 ev_stop (EV_A_ (W)w); 1430 ev_stop (EV_A_ (W)w);
1389} 1431}
1390 1432
… …
1393{ 1435{
1394 /* TODO: use adjustheap and recalculation */ 1436 /* TODO: use adjustheap and recalculation */
1395 ev_periodic_stop (EV_A_ w); 1437 ev_periodic_stop (EV_A_ w);
1396 ev_periodic_start (EV_A_ w); 1438 ev_periodic_start (EV_A_ w);
1397} 1439}
1440#endif
1398 1441
1399void 1442void
1400ev_idle_start (EV_P_ struct ev_idle *w) 1443ev_idle_start (EV_P_ struct ev_idle *w)
1401{ 1444{
1402 if (ev_is_active (w)) 1445 if (ev_is_active (w))
… …
1409 1452
1410void 1453void
1411ev_idle_stop (EV_P_ struct ev_idle *w) 1454ev_idle_stop (EV_P_ struct ev_idle *w)
1412{ 1455{
1413 ev_clear_pending (EV_A_ (W)w); 1456 ev_clear_pending (EV_A_ (W)w);
1414 if (ev_is_active (w)) 1457 if (!ev_is_active (w))
1415 return; 1458 return;
1416 1459
1417 idles [((W)w)->active - 1] = idles [--idlecnt]; 1460 idles [((W)w)->active - 1] = idles [--idlecnt];
1418 ev_stop (EV_A_ (W)w); 1461 ev_stop (EV_A_ (W)w);
1419} 1462}
… …
1431 1474
1432void 1475void
1433ev_prepare_stop (EV_P_ struct ev_prepare *w) 1476ev_prepare_stop (EV_P_ struct ev_prepare *w)
1434{ 1477{
1435 ev_clear_pending (EV_A_ (W)w); 1478 ev_clear_pending (EV_A_ (W)w);
1436 if (ev_is_active (w)) 1479 if (!ev_is_active (w))
1437 return; 1480 return;
1438 1481
1439 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1482 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1440 ev_stop (EV_A_ (W)w); 1483 ev_stop (EV_A_ (W)w);
1441} 1484}
… …
1453 1496
1454void 1497void
1455ev_check_stop (EV_P_ struct ev_check *w) 1498ev_check_stop (EV_P_ struct ev_check *w)
1456{ 1499{
1457 ev_clear_pending (EV_A_ (W)w); 1500 ev_clear_pending (EV_A_ (W)w);
1458 if (ev_is_active (w)) 1501 if (!ev_is_active (w))
1459 return; 1502 return;
1460 1503
1461 checks [((W)w)->active - 1] = checks [--checkcnt]; 1504 checks [((W)w)->active - 1] = checks [--checkcnt];
1462 ev_stop (EV_A_ (W)w); 1505 ev_stop (EV_A_ (W)w);
1463} 1506}
… …
1481 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1524 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1482 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1525 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1483 1526
1484 if (!((WL)w)->next) 1527 if (!((WL)w)->next)
1485 { 1528 {
1486#if WIN32 1529#if _WIN32
1487 signal (w->signum, sighandler); 1530 signal (w->signum, sighandler);
1488#else 1531#else
1489 struct sigaction sa; 1532 struct sigaction sa;
1490 sa.sa_handler = sighandler; 1533 sa.sa_handler = sighandler;
1491 sigfillset (&sa.sa_mask); 1534 sigfillset (&sa.sa_mask);
… …
1524 1567
1525void 1568void
1526ev_child_stop (EV_P_ struct ev_child *w) 1569ev_child_stop (EV_P_ struct ev_child *w)
1527{ 1570{
1528 ev_clear_pending (EV_A_ (W)w); 1571 ev_clear_pending (EV_A_ (W)w);
1529 if (ev_is_active (w)) 1572 if (!ev_is_active (w))
1530 return; 1573 return;
1531 1574
1532 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1575 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1533 ev_stop (EV_A_ (W)w); 1576 ev_stop (EV_A_ (W)w);
1534} 1577}
… …
1594 ev_timer_start (EV_A_ &once->to); 1637 ev_timer_start (EV_A_ &once->to);
1595 } 1638 }
1596 } 1639 }
1597} 1640}
1598 1641
1642#ifdef __cplusplus
1643}
1644#endif
1645

Diff Legend

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