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

Comparing libev/ev.c (file contents):
Revision 1.85 by root, Sat Nov 10 03:13:50 2007 UTC vs.
Revision 1.104 by root, Mon Nov 12 00:39:45 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
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
106#endif 117#endif
107 118
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
… …
117#endif 128#endif
118 129
119#ifndef CLOCK_REALTIME 130#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 131# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 132# define EV_USE_REALTIME 0
133#endif
134
135#if EV_SELECT_IS_WINSOCKET
136# include <winsock.h>
122#endif 137#endif
123 138
124/**/ 139/**/
125 140
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 141#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
… …
146#define expect_true(expr) expect ((expr) != 0, 1) 161#define expect_true(expr) expect ((expr) != 0, 1)
147 162
148#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 163#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
149#define ABSPRI(w) ((w)->priority - EV_MINPRI) 164#define ABSPRI(w) ((w)->priority - EV_MINPRI)
150 165
166#define EMPTY /* required for microsofts broken pseudo-c compiler */
167
151typedef struct ev_watcher *W; 168typedef struct ev_watcher *W;
152typedef struct ev_watcher_list *WL; 169typedef struct ev_watcher_list *WL;
153typedef struct ev_watcher_time *WT; 170typedef struct ev_watcher_time *WT;
154 171
155static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 172static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
156 173
174#ifdef _WIN32
157#include "ev_win32.c" 175# include "ev_win32.c"
176#endif
158 177
159/*****************************************************************************/ 178/*****************************************************************************/
160 179
161static void (*syserr_cb)(const char *msg); 180static void (*syserr_cb)(const char *msg);
162 181
… …
209typedef struct 228typedef struct
210{ 229{
211 WL head; 230 WL head;
212 unsigned char events; 231 unsigned char events;
213 unsigned char reify; 232 unsigned char reify;
233#if EV_SELECT_IS_WINSOCKET
234 SOCKET handle;
235#endif
214} ANFD; 236} ANFD;
215 237
216typedef struct 238typedef struct
217{ 239{
218 W w; 240 W w;
… …
221 243
222#if EV_MULTIPLICITY 244#if EV_MULTIPLICITY
223 245
224 struct ev_loop 246 struct ev_loop
225 { 247 {
248 ev_tstamp ev_rt_now;
249 #define ev_rt_now ((loop)->ev_rt_now)
226 #define VAR(name,decl) decl; 250 #define VAR(name,decl) decl;
227 #include "ev_vars.h" 251 #include "ev_vars.h"
228 #undef VAR 252 #undef VAR
229 }; 253 };
230 #include "ev_wrap.h" 254 #include "ev_wrap.h"
… …
232 struct ev_loop default_loop_struct; 256 struct ev_loop default_loop_struct;
233 static struct ev_loop *default_loop; 257 static struct ev_loop *default_loop;
234 258
235#else 259#else
236 260
261 ev_tstamp ev_rt_now;
237 #define VAR(name,decl) static decl; 262 #define VAR(name,decl) static decl;
238 #include "ev_vars.h" 263 #include "ev_vars.h"
239 #undef VAR 264 #undef VAR
240 265
241 static int default_loop; 266 static int default_loop;
242 267
243#endif 268#endif
244 269
245/*****************************************************************************/ 270/*****************************************************************************/
246 271
247inline ev_tstamp 272ev_tstamp
248ev_time (void) 273ev_time (void)
249{ 274{
250#if EV_USE_REALTIME 275#if EV_USE_REALTIME
251 struct timespec ts; 276 struct timespec ts;
252 clock_gettime (CLOCK_REALTIME, &ts); 277 clock_gettime (CLOCK_REALTIME, &ts);
… …
304 stem ## max = array_roundsize (stem ## cnt >> 1); \ 329 stem ## max = array_roundsize (stem ## cnt >> 1); \
305 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 330 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
306 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 331 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
307 } 332 }
308 333
309/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
310/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
311#define array_free_microshit(stem) \
312 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
313
314#define array_free(stem, idx) \ 334#define array_free(stem, idx) \
315 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 335 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
316 336
317/*****************************************************************************/ 337/*****************************************************************************/
318 338
… …
392 int events = 0; 412 int events = 0;
393 413
394 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 414 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
395 events |= w->events; 415 events |= w->events;
396 416
417#if EV_SELECT_IS_WINSOCKET
418 if (events)
419 {
420 unsigned long argp;
421 anfd->handle = _get_osfhandle (fd);
422 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
423 }
424#endif
425
397 anfd->reify = 0; 426 anfd->reify = 0;
398 427
399 method_modify (EV_A_ fd, anfd->events, events); 428 method_modify (EV_A_ fd, anfd->events, events);
400 anfd->events = events; 429 anfd->events = events;
401 } 430 }
… …
429} 458}
430 459
431static int 460static int
432fd_valid (int fd) 461fd_valid (int fd)
433{ 462{
434#ifdef WIN32 463#ifdef _WIN32
435 return !!win32_get_osfhandle (fd); 464 return _get_osfhandle (fd) != -1;
436#else 465#else
437 return fcntl (fd, F_GETFD) != -1; 466 return fcntl (fd, F_GETFD) != -1;
438#endif 467#endif
439} 468}
440 469
… …
521 heap [k] = w; 550 heap [k] = w;
522 ((W)heap [k])->active = k + 1; 551 ((W)heap [k])->active = k + 1;
523} 552}
524 553
525inline void 554inline void
526adjustheap (WT *heap, int N, int k, ev_tstamp at) 555adjustheap (WT *heap, int N, int k)
527{ 556{
528 ev_tstamp old_at = heap [k]->at; 557 upheap (heap, k);
529 heap [k]->at = at;
530
531 if (old_at < at)
532 downheap (heap, N, k); 558 downheap (heap, N, k);
533 else
534 upheap (heap, k);
535} 559}
536 560
537/*****************************************************************************/ 561/*****************************************************************************/
538 562
539typedef struct 563typedef struct
… …
562} 586}
563 587
564static void 588static void
565sighandler (int signum) 589sighandler (int signum)
566{ 590{
567#if WIN32 591#if _WIN32
568 signal (signum, sighandler); 592 signal (signum, sighandler);
569#endif 593#endif
570 594
571 signals [signum - 1].gotsig = 1; 595 signals [signum - 1].gotsig = 1;
572 596
573 if (!gotsig) 597 if (!gotsig)
574 { 598 {
575 int old_errno = errno; 599 int old_errno = errno;
576 gotsig = 1; 600 gotsig = 1;
577#ifdef WIN32
578 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
579#else
580 write (sigpipe [1], &signum, 1); 601 write (sigpipe [1], &signum, 1);
581#endif
582 errno = old_errno; 602 errno = old_errno;
583 } 603 }
584} 604}
585 605
586void 606void
… …
606static void 626static void
607sigcb (EV_P_ struct ev_io *iow, int revents) 627sigcb (EV_P_ struct ev_io *iow, int revents)
608{ 628{
609 int signum; 629 int signum;
610 630
611#ifdef WIN32
612 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
613#else
614 read (sigpipe [0], &revents, 1); 631 read (sigpipe [0], &revents, 1);
615#endif
616 gotsig = 0; 632 gotsig = 0;
617 633
618 for (signum = signalmax; signum--; ) 634 for (signum = signalmax; signum--; )
619 if (signals [signum].gotsig) 635 if (signals [signum].gotsig)
620 ev_feed_signal_event (EV_A_ signum + 1); 636 ev_feed_signal_event (EV_A_ signum + 1);
621} 637}
622 638
639inline void
640fd_intern (int fd)
641{
642#ifdef _WIN32
643 int arg = 1;
644 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
645#else
646 fcntl (fd, F_SETFD, FD_CLOEXEC);
647 fcntl (fd, F_SETFL, O_NONBLOCK);
648#endif
649}
650
623static void 651static void
624siginit (EV_P) 652siginit (EV_P)
625{ 653{
626#ifndef WIN32 654 fd_intern (sigpipe [0]);
627 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 655 fd_intern (sigpipe [1]);
628 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
629
630 /* rather than sort out wether we really need nb, set it */
631 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
632 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
633#endif
634 656
635 ev_io_set (&sigev, sigpipe [0], EV_READ); 657 ev_io_set (&sigev, sigpipe [0], EV_READ);
636 ev_io_start (EV_A_ &sigev); 658 ev_io_start (EV_A_ &sigev);
637 ev_unref (EV_A); /* child watcher should not keep loop alive */ 659 ev_unref (EV_A); /* child watcher should not keep loop alive */
638} 660}
639 661
640/*****************************************************************************/ 662/*****************************************************************************/
641 663
642static struct ev_child *childs [PID_HASHSIZE]; 664static struct ev_child *childs [PID_HASHSIZE];
643 665
644#ifndef WIN32 666#ifndef _WIN32
645 667
646static struct ev_signal childev; 668static struct ev_signal childev;
647 669
648#ifndef WCONTINUED 670#ifndef WCONTINUED
649# define WCONTINUED 0 671# define WCONTINUED 0
… …
710 732
711/* return true if we are running with elevated privileges and should ignore env variables */ 733/* return true if we are running with elevated privileges and should ignore env variables */
712static int 734static int
713enable_secure (void) 735enable_secure (void)
714{ 736{
715#ifdef WIN32 737#ifdef _WIN32
716 return 0; 738 return 0;
717#else 739#else
718 return getuid () != geteuid () 740 return getuid () != geteuid ()
719 || getgid () != getegid (); 741 || getgid () != getegid ();
720#endif 742#endif
… …
749 methods = atoi (getenv ("LIBEV_METHODS")); 771 methods = atoi (getenv ("LIBEV_METHODS"));
750 else 772 else
751 methods = EVMETHOD_ANY; 773 methods = EVMETHOD_ANY;
752 774
753 method = 0; 775 method = 0;
754#if EV_USE_WIN32
755 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
756#endif
757#if EV_USE_KQUEUE 776#if EV_USE_KQUEUE
758 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 777 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
759#endif 778#endif
760#if EV_USE_EPOLL 779#if EV_USE_EPOLL
761 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 780 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
… …
775void 794void
776loop_destroy (EV_P) 795loop_destroy (EV_P)
777{ 796{
778 int i; 797 int i;
779 798
780#if EV_USE_WIN32
781 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
782#endif
783#if EV_USE_KQUEUE 799#if EV_USE_KQUEUE
784 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 800 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
785#endif 801#endif
786#if EV_USE_EPOLL 802#if EV_USE_EPOLL
787 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 803 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
795 811
796 for (i = NUMPRI; i--; ) 812 for (i = NUMPRI; i--; )
797 array_free (pending, [i]); 813 array_free (pending, [i]);
798 814
799 /* have to use the microsoft-never-gets-it-right macro */ 815 /* have to use the microsoft-never-gets-it-right macro */
800 array_free_microshit (fdchange); 816 array_free (fdchange, EMPTY);
801 array_free_microshit (timer); 817 array_free (timer, EMPTY);
802 array_free_microshit (periodic); 818#if EV_PERIODICS
803 array_free_microshit (idle); 819 array_free (periodic, EMPTY);
804 array_free_microshit (prepare); 820#endif
805 array_free_microshit (check); 821 array_free (idle, EMPTY);
822 array_free (prepare, EMPTY);
823 array_free (check, EMPTY);
806 824
807 method = 0; 825 method = 0;
808} 826}
809 827
810static void 828static void
… …
889 907
890 if (ev_method (EV_A)) 908 if (ev_method (EV_A))
891 { 909 {
892 siginit (EV_A); 910 siginit (EV_A);
893 911
894#ifndef WIN32 912#ifndef _WIN32
895 ev_signal_init (&childev, childcb, SIGCHLD); 913 ev_signal_init (&childev, childcb, SIGCHLD);
896 ev_set_priority (&childev, EV_MAXPRI); 914 ev_set_priority (&childev, EV_MAXPRI);
897 ev_signal_start (EV_A_ &childev); 915 ev_signal_start (EV_A_ &childev);
898 ev_unref (EV_A); /* child watcher should not keep loop alive */ 916 ev_unref (EV_A); /* child watcher should not keep loop alive */
899#endif 917#endif
… …
910{ 928{
911#if EV_MULTIPLICITY 929#if EV_MULTIPLICITY
912 struct ev_loop *loop = default_loop; 930 struct ev_loop *loop = default_loop;
913#endif 931#endif
914 932
915#ifndef WIN32 933#ifndef _WIN32
916 ev_ref (EV_A); /* child watcher */ 934 ev_ref (EV_A); /* child watcher */
917 ev_signal_stop (EV_A_ &childev); 935 ev_signal_stop (EV_A_ &childev);
918#endif 936#endif
919 937
920 ev_ref (EV_A); /* signal watcher */ 938 ev_ref (EV_A); /* signal watcher */
… …
980 998
981 /* first reschedule or stop timer */ 999 /* first reschedule or stop timer */
982 if (w->repeat) 1000 if (w->repeat)
983 { 1001 {
984 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1002 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1003
985 ((WT)w)->at = mn_now + w->repeat; 1004 ((WT)w)->at += w->repeat;
1005 if (((WT)w)->at < mn_now)
1006 ((WT)w)->at = mn_now;
1007
986 downheap ((WT *)timers, timercnt, 0); 1008 downheap ((WT *)timers, timercnt, 0);
987 } 1009 }
988 else 1010 else
989 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1011 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
990 1012
991 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1013 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
992 } 1014 }
993} 1015}
994 1016
1017#if EV_PERIODICS
995static void 1018static void
996periodics_reify (EV_P) 1019periodics_reify (EV_P)
997{ 1020{
998 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1021 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
999 { 1022 {
… …
1040 1063
1041 /* now rebuild the heap */ 1064 /* now rebuild the heap */
1042 for (i = periodiccnt >> 1; i--; ) 1065 for (i = periodiccnt >> 1; i--; )
1043 downheap ((WT *)periodics, periodiccnt, i); 1066 downheap ((WT *)periodics, periodiccnt, i);
1044} 1067}
1068#endif
1045 1069
1046inline int 1070inline int
1047time_update_monotonic (EV_P) 1071time_update_monotonic (EV_P)
1048{ 1072{
1049 mn_now = get_clock (); 1073 mn_now = get_clock ();
… …
1083 ev_rt_now = ev_time (); 1107 ev_rt_now = ev_time ();
1084 mn_now = get_clock (); 1108 mn_now = get_clock ();
1085 now_floor = mn_now; 1109 now_floor = mn_now;
1086 } 1110 }
1087 1111
1112# if EV_PERIODICS
1088 periodics_reschedule (EV_A); 1113 periodics_reschedule (EV_A);
1114# endif
1089 /* no timer adjustment, as the monotonic clock doesn't jump */ 1115 /* no timer adjustment, as the monotonic clock doesn't jump */
1090 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1116 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1091 } 1117 }
1092 } 1118 }
1093 else 1119 else
… …
1095 { 1121 {
1096 ev_rt_now = ev_time (); 1122 ev_rt_now = ev_time ();
1097 1123
1098 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1124 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1099 { 1125 {
1126#if EV_PERIODICS
1100 periodics_reschedule (EV_A); 1127 periodics_reschedule (EV_A);
1128#endif
1101 1129
1102 /* adjust timers. this is easy, as the offset is the same for all */ 1130 /* adjust timers. this is easy, as the offset is the same for all */
1103 for (i = 0; i < timercnt; ++i) 1131 for (i = 0; i < timercnt; ++i)
1104 ((WT)timers [i])->at += ev_rt_now - mn_now; 1132 ((WT)timers [i])->at += ev_rt_now - mn_now;
1105 } 1133 }
… …
1168 { 1196 {
1169 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1197 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1170 if (block > to) block = to; 1198 if (block > to) block = to;
1171 } 1199 }
1172 1200
1201#if EV_PERIODICS
1173 if (periodiccnt) 1202 if (periodiccnt)
1174 { 1203 {
1175 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1204 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1176 if (block > to) block = to; 1205 if (block > to) block = to;
1177 } 1206 }
1207#endif
1178 1208
1179 if (block < 0.) block = 0.; 1209 if (block < 0.) block = 0.;
1180 } 1210 }
1181 1211
1182 method_poll (EV_A_ block); 1212 method_poll (EV_A_ block);
… …
1184 /* update ev_rt_now, do magic */ 1214 /* update ev_rt_now, do magic */
1185 time_update (EV_A); 1215 time_update (EV_A);
1186 1216
1187 /* queue pending timers and reschedule them */ 1217 /* queue pending timers and reschedule them */
1188 timers_reify (EV_A); /* relative timers called last */ 1218 timers_reify (EV_A); /* relative timers called last */
1219#if EV_PERIODICS
1189 periodics_reify (EV_A); /* absolute timers called first */ 1220 periodics_reify (EV_A); /* absolute timers called first */
1221#endif
1190 1222
1191 /* queue idle watchers unless io or timers are pending */ 1223 /* queue idle watchers unless io or timers are pending */
1192 if (idlecnt && !any_pending (EV_A)) 1224 if (idlecnt && !any_pending (EV_A))
1193 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1225 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1194 1226
… …
1285{ 1317{
1286 ev_clear_pending (EV_A_ (W)w); 1318 ev_clear_pending (EV_A_ (W)w);
1287 if (!ev_is_active (w)) 1319 if (!ev_is_active (w))
1288 return; 1320 return;
1289 1321
1322 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1323
1290 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1324 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1291 ev_stop (EV_A_ (W)w); 1325 ev_stop (EV_A_ (W)w);
1292 1326
1293 fd_change (EV_A_ w->fd); 1327 fd_change (EV_A_ w->fd);
1294} 1328}
… …
1321 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1355 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1322 1356
1323 if (((W)w)->active < timercnt--) 1357 if (((W)w)->active < timercnt--)
1324 { 1358 {
1325 timers [((W)w)->active - 1] = timers [timercnt]; 1359 timers [((W)w)->active - 1] = timers [timercnt];
1326 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1360 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1327 } 1361 }
1328 1362
1329 ((WT)w)->at = w->repeat; 1363 ((WT)w)->at -= mn_now;
1330 1364
1331 ev_stop (EV_A_ (W)w); 1365 ev_stop (EV_A_ (W)w);
1332} 1366}
1333 1367
1334void 1368void
1335ev_timer_again (EV_P_ struct ev_timer *w) 1369ev_timer_again (EV_P_ struct ev_timer *w)
1336{ 1370{
1337 if (ev_is_active (w)) 1371 if (ev_is_active (w))
1338 { 1372 {
1339 if (w->repeat) 1373 if (w->repeat)
1374 {
1375 ((WT)w)->at = mn_now + w->repeat;
1340 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1376 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1377 }
1341 else 1378 else
1342 ev_timer_stop (EV_A_ w); 1379 ev_timer_stop (EV_A_ w);
1343 } 1380 }
1344 else if (w->repeat) 1381 else if (w->repeat)
1345 ev_timer_start (EV_A_ w); 1382 ev_timer_start (EV_A_ w);
1346} 1383}
1347 1384
1385#if EV_PERIODICS
1348void 1386void
1349ev_periodic_start (EV_P_ struct ev_periodic *w) 1387ev_periodic_start (EV_P_ struct ev_periodic *w)
1350{ 1388{
1351 if (ev_is_active (w)) 1389 if (ev_is_active (w))
1352 return; 1390 return;
… …
1378 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1416 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1379 1417
1380 if (((W)w)->active < periodiccnt--) 1418 if (((W)w)->active < periodiccnt--)
1381 { 1419 {
1382 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1420 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1383 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1421 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1384 } 1422 }
1385 1423
1386 ev_stop (EV_A_ (W)w); 1424 ev_stop (EV_A_ (W)w);
1387} 1425}
1388 1426
… …
1391{ 1429{
1392 /* TODO: use adjustheap and recalculation */ 1430 /* TODO: use adjustheap and recalculation */
1393 ev_periodic_stop (EV_A_ w); 1431 ev_periodic_stop (EV_A_ w);
1394 ev_periodic_start (EV_A_ w); 1432 ev_periodic_start (EV_A_ w);
1395} 1433}
1434#endif
1396 1435
1397void 1436void
1398ev_idle_start (EV_P_ struct ev_idle *w) 1437ev_idle_start (EV_P_ struct ev_idle *w)
1399{ 1438{
1400 if (ev_is_active (w)) 1439 if (ev_is_active (w))
… …
1407 1446
1408void 1447void
1409ev_idle_stop (EV_P_ struct ev_idle *w) 1448ev_idle_stop (EV_P_ struct ev_idle *w)
1410{ 1449{
1411 ev_clear_pending (EV_A_ (W)w); 1450 ev_clear_pending (EV_A_ (W)w);
1412 if (ev_is_active (w)) 1451 if (!ev_is_active (w))
1413 return; 1452 return;
1414 1453
1415 idles [((W)w)->active - 1] = idles [--idlecnt]; 1454 idles [((W)w)->active - 1] = idles [--idlecnt];
1416 ev_stop (EV_A_ (W)w); 1455 ev_stop (EV_A_ (W)w);
1417} 1456}
… …
1429 1468
1430void 1469void
1431ev_prepare_stop (EV_P_ struct ev_prepare *w) 1470ev_prepare_stop (EV_P_ struct ev_prepare *w)
1432{ 1471{
1433 ev_clear_pending (EV_A_ (W)w); 1472 ev_clear_pending (EV_A_ (W)w);
1434 if (ev_is_active (w)) 1473 if (!ev_is_active (w))
1435 return; 1474 return;
1436 1475
1437 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1476 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1438 ev_stop (EV_A_ (W)w); 1477 ev_stop (EV_A_ (W)w);
1439} 1478}
… …
1451 1490
1452void 1491void
1453ev_check_stop (EV_P_ struct ev_check *w) 1492ev_check_stop (EV_P_ struct ev_check *w)
1454{ 1493{
1455 ev_clear_pending (EV_A_ (W)w); 1494 ev_clear_pending (EV_A_ (W)w);
1456 if (ev_is_active (w)) 1495 if (!ev_is_active (w))
1457 return; 1496 return;
1458 1497
1459 checks [((W)w)->active - 1] = checks [--checkcnt]; 1498 checks [((W)w)->active - 1] = checks [--checkcnt];
1460 ev_stop (EV_A_ (W)w); 1499 ev_stop (EV_A_ (W)w);
1461} 1500}
… …
1479 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1518 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1480 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1519 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1481 1520
1482 if (!((WL)w)->next) 1521 if (!((WL)w)->next)
1483 { 1522 {
1484#if WIN32 1523#if _WIN32
1485 signal (w->signum, sighandler); 1524 signal (w->signum, sighandler);
1486#else 1525#else
1487 struct sigaction sa; 1526 struct sigaction sa;
1488 sa.sa_handler = sighandler; 1527 sa.sa_handler = sighandler;
1489 sigfillset (&sa.sa_mask); 1528 sigfillset (&sa.sa_mask);
… …
1522 1561
1523void 1562void
1524ev_child_stop (EV_P_ struct ev_child *w) 1563ev_child_stop (EV_P_ struct ev_child *w)
1525{ 1564{
1526 ev_clear_pending (EV_A_ (W)w); 1565 ev_clear_pending (EV_A_ (W)w);
1527 if (ev_is_active (w)) 1566 if (!ev_is_active (w))
1528 return; 1567 return;
1529 1568
1530 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1569 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1531 ev_stop (EV_A_ (W)w); 1570 ev_stop (EV_A_ (W)w);
1532} 1571}
… …
1592 ev_timer_start (EV_A_ &once->to); 1631 ev_timer_start (EV_A_ &once->to);
1593 } 1632 }
1594 } 1633 }
1595} 1634}
1596 1635
1636#ifdef __cplusplus
1637}
1638#endif
1639

Diff Legend

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