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.103 by root, Mon Nov 12 00:31:08 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
… …
91# define EV_USE_EPOLL 0 107# define EV_USE_EPOLL 0
92#endif 108#endif
93 109
94#ifndef EV_USE_KQUEUE 110#ifndef EV_USE_KQUEUE
95# define EV_USE_KQUEUE 0 111# 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 112#endif
107 113
108#ifndef EV_USE_REALTIME 114#ifndef EV_USE_REALTIME
109# define EV_USE_REALTIME 1 115# define EV_USE_REALTIME 1
110#endif 116#endif
… …
117#endif 123#endif
118 124
119#ifndef CLOCK_REALTIME 125#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 126# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 127# define EV_USE_REALTIME 0
128#endif
129
130#if EV_SELECT_IS_WINSOCKET
131# include <winsock.h>
122#endif 132#endif
123 133
124/**/ 134/**/
125 135
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 136#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
… …
146#define expect_true(expr) expect ((expr) != 0, 1) 156#define expect_true(expr) expect ((expr) != 0, 1)
147 157
148#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 158#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
149#define ABSPRI(w) ((w)->priority - EV_MINPRI) 159#define ABSPRI(w) ((w)->priority - EV_MINPRI)
150 160
161#define EMPTY /* required for microsofts broken pseudo-c compiler */
162
151typedef struct ev_watcher *W; 163typedef struct ev_watcher *W;
152typedef struct ev_watcher_list *WL; 164typedef struct ev_watcher_list *WL;
153typedef struct ev_watcher_time *WT; 165typedef struct ev_watcher_time *WT;
154 166
155static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 167static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
156 168
169#ifdef _WIN32
157#include "ev_win32.c" 170# include "ev_win32.c"
171#endif
158 172
159/*****************************************************************************/ 173/*****************************************************************************/
160 174
161static void (*syserr_cb)(const char *msg); 175static void (*syserr_cb)(const char *msg);
162 176
… …
209typedef struct 223typedef struct
210{ 224{
211 WL head; 225 WL head;
212 unsigned char events; 226 unsigned char events;
213 unsigned char reify; 227 unsigned char reify;
228#if EV_SELECT_IS_WINSOCKET
229 SOCKET handle;
230#endif
214} ANFD; 231} ANFD;
215 232
216typedef struct 233typedef struct
217{ 234{
218 W w; 235 W w;
… …
222#if EV_MULTIPLICITY 239#if EV_MULTIPLICITY
223 240
224 struct ev_loop 241 struct ev_loop
225 { 242 {
226 ev_tstamp ev_rt_now; 243 ev_tstamp ev_rt_now;
244 #define ev_rt_now ((loop)->ev_rt_now)
227 #define VAR(name,decl) decl; 245 #define VAR(name,decl) decl;
228 #include "ev_vars.h" 246 #include "ev_vars.h"
229 #undef VAR 247 #undef VAR
230 }; 248 };
231 #include "ev_wrap.h" 249 #include "ev_wrap.h"
… …
244 262
245#endif 263#endif
246 264
247/*****************************************************************************/ 265/*****************************************************************************/
248 266
249inline ev_tstamp 267ev_tstamp
250ev_time (void) 268ev_time (void)
251{ 269{
252#if EV_USE_REALTIME 270#if EV_USE_REALTIME
253 struct timespec ts; 271 struct timespec ts;
254 clock_gettime (CLOCK_REALTIME, &ts); 272 clock_gettime (CLOCK_REALTIME, &ts);
… …
306 stem ## max = array_roundsize (stem ## cnt >> 1); \ 324 stem ## max = array_roundsize (stem ## cnt >> 1); \
307 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 325 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
308 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 326 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
309 } 327 }
310 328
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) \ 329#define array_free(stem, idx) \
317 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 330 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
318 331
319/*****************************************************************************/ 332/*****************************************************************************/
320 333
… …
394 int events = 0; 407 int events = 0;
395 408
396 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 409 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
397 events |= w->events; 410 events |= w->events;
398 411
412#if EV_SELECT_IS_WINSOCKET
413 if (events)
414 {
415 unsigned long argp;
416 anfd->handle = _get_osfhandle (fd);
417 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
418 }
419#endif
420
399 anfd->reify = 0; 421 anfd->reify = 0;
400 422
401 method_modify (EV_A_ fd, anfd->events, events); 423 method_modify (EV_A_ fd, anfd->events, events);
402 anfd->events = events; 424 anfd->events = events;
403 } 425 }
… …
431} 453}
432 454
433static int 455static int
434fd_valid (int fd) 456fd_valid (int fd)
435{ 457{
436#ifdef WIN32 458#ifdef _WIN32
437 return !!win32_get_osfhandle (fd); 459 return _get_osfhandle (fd) != -1;
438#else 460#else
439 return fcntl (fd, F_GETFD) != -1; 461 return fcntl (fd, F_GETFD) != -1;
440#endif 462#endif
441} 463}
442 464
… …
523 heap [k] = w; 545 heap [k] = w;
524 ((W)heap [k])->active = k + 1; 546 ((W)heap [k])->active = k + 1;
525} 547}
526 548
527inline void 549inline void
528adjustheap (WT *heap, int N, int k, ev_tstamp at) 550adjustheap (WT *heap, int N, int k)
529{ 551{
530 ev_tstamp old_at = heap [k]->at; 552 upheap (heap, k);
531 heap [k]->at = at;
532
533 if (old_at < at)
534 downheap (heap, N, k); 553 downheap (heap, N, k);
535 else
536 upheap (heap, k);
537} 554}
538 555
539/*****************************************************************************/ 556/*****************************************************************************/
540 557
541typedef struct 558typedef struct
… …
564} 581}
565 582
566static void 583static void
567sighandler (int signum) 584sighandler (int signum)
568{ 585{
569#if WIN32 586#if _WIN32
570 signal (signum, sighandler); 587 signal (signum, sighandler);
571#endif 588#endif
572 589
573 signals [signum - 1].gotsig = 1; 590 signals [signum - 1].gotsig = 1;
574 591
575 if (!gotsig) 592 if (!gotsig)
576 { 593 {
577 int old_errno = errno; 594 int old_errno = errno;
578 gotsig = 1; 595 gotsig = 1;
579#ifdef WIN32
580 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
581#else
582 write (sigpipe [1], &signum, 1); 596 write (sigpipe [1], &signum, 1);
583#endif
584 errno = old_errno; 597 errno = old_errno;
585 } 598 }
586} 599}
587 600
588void 601void
… …
608static void 621static void
609sigcb (EV_P_ struct ev_io *iow, int revents) 622sigcb (EV_P_ struct ev_io *iow, int revents)
610{ 623{
611 int signum; 624 int signum;
612 625
613#ifdef WIN32
614 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
615#else
616 read (sigpipe [0], &revents, 1); 626 read (sigpipe [0], &revents, 1);
617#endif
618 gotsig = 0; 627 gotsig = 0;
619 628
620 for (signum = signalmax; signum--; ) 629 for (signum = signalmax; signum--; )
621 if (signals [signum].gotsig) 630 if (signals [signum].gotsig)
622 ev_feed_signal_event (EV_A_ signum + 1); 631 ev_feed_signal_event (EV_A_ signum + 1);
623} 632}
624 633
634inline void
635fd_intern (int fd)
636{
637#ifdef _WIN32
638 int arg = 1;
639 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
640#else
641 fcntl (fd, F_SETFD, FD_CLOEXEC);
642 fcntl (fd, F_SETFL, O_NONBLOCK);
643#endif
644}
645
625static void 646static void
626siginit (EV_P) 647siginit (EV_P)
627{ 648{
628#ifndef WIN32 649 fd_intern (sigpipe [0]);
629 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 650 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 651
637 ev_io_set (&sigev, sigpipe [0], EV_READ); 652 ev_io_set (&sigev, sigpipe [0], EV_READ);
638 ev_io_start (EV_A_ &sigev); 653 ev_io_start (EV_A_ &sigev);
639 ev_unref (EV_A); /* child watcher should not keep loop alive */ 654 ev_unref (EV_A); /* child watcher should not keep loop alive */
640} 655}
641 656
642/*****************************************************************************/ 657/*****************************************************************************/
643 658
644static struct ev_child *childs [PID_HASHSIZE]; 659static struct ev_child *childs [PID_HASHSIZE];
645 660
646#ifndef WIN32 661#ifndef _WIN32
647 662
648static struct ev_signal childev; 663static struct ev_signal childev;
649 664
650#ifndef WCONTINUED 665#ifndef WCONTINUED
651# define WCONTINUED 0 666# define WCONTINUED 0
… …
712 727
713/* return true if we are running with elevated privileges and should ignore env variables */ 728/* return true if we are running with elevated privileges and should ignore env variables */
714static int 729static int
715enable_secure (void) 730enable_secure (void)
716{ 731{
717#ifdef WIN32 732#ifdef _WIN32
718 return 0; 733 return 0;
719#else 734#else
720 return getuid () != geteuid () 735 return getuid () != geteuid ()
721 || getgid () != getegid (); 736 || getgid () != getegid ();
722#endif 737#endif
… …
751 methods = atoi (getenv ("LIBEV_METHODS")); 766 methods = atoi (getenv ("LIBEV_METHODS"));
752 else 767 else
753 methods = EVMETHOD_ANY; 768 methods = EVMETHOD_ANY;
754 769
755 method = 0; 770 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 771#if EV_USE_KQUEUE
760 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 772 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
761#endif 773#endif
762#if EV_USE_EPOLL 774#if EV_USE_EPOLL
763 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 775 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
… …
777void 789void
778loop_destroy (EV_P) 790loop_destroy (EV_P)
779{ 791{
780 int i; 792 int i;
781 793
782#if EV_USE_WIN32
783 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
784#endif
785#if EV_USE_KQUEUE 794#if EV_USE_KQUEUE
786 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 795 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
787#endif 796#endif
788#if EV_USE_EPOLL 797#if EV_USE_EPOLL
789 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 798 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
797 806
798 for (i = NUMPRI; i--; ) 807 for (i = NUMPRI; i--; )
799 array_free (pending, [i]); 808 array_free (pending, [i]);
800 809
801 /* have to use the microsoft-never-gets-it-right macro */ 810 /* have to use the microsoft-never-gets-it-right macro */
802 array_free_microshit (fdchange); 811 array_free (fdchange, EMPTY);
803 array_free_microshit (timer); 812 array_free (timer, EMPTY);
804 array_free_microshit (periodic); 813#if EV_PERIODICS
805 array_free_microshit (idle); 814 array_free (periodic, EMPTY);
806 array_free_microshit (prepare); 815#endif
807 array_free_microshit (check); 816 array_free (idle, EMPTY);
817 array_free (prepare, EMPTY);
818 array_free (check, EMPTY);
808 819
809 method = 0; 820 method = 0;
810} 821}
811 822
812static void 823static void
… …
891 902
892 if (ev_method (EV_A)) 903 if (ev_method (EV_A))
893 { 904 {
894 siginit (EV_A); 905 siginit (EV_A);
895 906
896#ifndef WIN32 907#ifndef _WIN32
897 ev_signal_init (&childev, childcb, SIGCHLD); 908 ev_signal_init (&childev, childcb, SIGCHLD);
898 ev_set_priority (&childev, EV_MAXPRI); 909 ev_set_priority (&childev, EV_MAXPRI);
899 ev_signal_start (EV_A_ &childev); 910 ev_signal_start (EV_A_ &childev);
900 ev_unref (EV_A); /* child watcher should not keep loop alive */ 911 ev_unref (EV_A); /* child watcher should not keep loop alive */
901#endif 912#endif
… …
912{ 923{
913#if EV_MULTIPLICITY 924#if EV_MULTIPLICITY
914 struct ev_loop *loop = default_loop; 925 struct ev_loop *loop = default_loop;
915#endif 926#endif
916 927
917#ifndef WIN32 928#ifndef _WIN32
918 ev_ref (EV_A); /* child watcher */ 929 ev_ref (EV_A); /* child watcher */
919 ev_signal_stop (EV_A_ &childev); 930 ev_signal_stop (EV_A_ &childev);
920#endif 931#endif
921 932
922 ev_ref (EV_A); /* signal watcher */ 933 ev_ref (EV_A); /* signal watcher */
… …
982 993
983 /* first reschedule or stop timer */ 994 /* first reschedule or stop timer */
984 if (w->repeat) 995 if (w->repeat)
985 { 996 {
986 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 997 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
998
987 ((WT)w)->at = mn_now + w->repeat; 999 ((WT)w)->at += w->repeat;
1000 if (((WT)w)->at < mn_now)
1001 ((WT)w)->at = mn_now;
1002
988 downheap ((WT *)timers, timercnt, 0); 1003 downheap ((WT *)timers, timercnt, 0);
989 } 1004 }
990 else 1005 else
991 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1006 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
992 1007
993 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1008 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
994 } 1009 }
995} 1010}
996 1011
1012#if EV_PERIODICS
997static void 1013static void
998periodics_reify (EV_P) 1014periodics_reify (EV_P)
999{ 1015{
1000 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1016 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1001 { 1017 {
… …
1042 1058
1043 /* now rebuild the heap */ 1059 /* now rebuild the heap */
1044 for (i = periodiccnt >> 1; i--; ) 1060 for (i = periodiccnt >> 1; i--; )
1045 downheap ((WT *)periodics, periodiccnt, i); 1061 downheap ((WT *)periodics, periodiccnt, i);
1046} 1062}
1063#endif
1047 1064
1048inline int 1065inline int
1049time_update_monotonic (EV_P) 1066time_update_monotonic (EV_P)
1050{ 1067{
1051 mn_now = get_clock (); 1068 mn_now = get_clock ();
… …
1085 ev_rt_now = ev_time (); 1102 ev_rt_now = ev_time ();
1086 mn_now = get_clock (); 1103 mn_now = get_clock ();
1087 now_floor = mn_now; 1104 now_floor = mn_now;
1088 } 1105 }
1089 1106
1107# if EV_PERIODICS
1090 periodics_reschedule (EV_A); 1108 periodics_reschedule (EV_A);
1109# endif
1091 /* no timer adjustment, as the monotonic clock doesn't jump */ 1110 /* no timer adjustment, as the monotonic clock doesn't jump */
1092 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1111 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1093 } 1112 }
1094 } 1113 }
1095 else 1114 else
… …
1097 { 1116 {
1098 ev_rt_now = ev_time (); 1117 ev_rt_now = ev_time ();
1099 1118
1100 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1119 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1101 { 1120 {
1121#if EV_PERIODICS
1102 periodics_reschedule (EV_A); 1122 periodics_reschedule (EV_A);
1123#endif
1103 1124
1104 /* adjust timers. this is easy, as the offset is the same for all */ 1125 /* adjust timers. this is easy, as the offset is the same for all */
1105 for (i = 0; i < timercnt; ++i) 1126 for (i = 0; i < timercnt; ++i)
1106 ((WT)timers [i])->at += ev_rt_now - mn_now; 1127 ((WT)timers [i])->at += ev_rt_now - mn_now;
1107 } 1128 }
… …
1170 { 1191 {
1171 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1192 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1172 if (block > to) block = to; 1193 if (block > to) block = to;
1173 } 1194 }
1174 1195
1196#if EV_PERIODICS
1175 if (periodiccnt) 1197 if (periodiccnt)
1176 { 1198 {
1177 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1199 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1178 if (block > to) block = to; 1200 if (block > to) block = to;
1179 } 1201 }
1202#endif
1180 1203
1181 if (block < 0.) block = 0.; 1204 if (block < 0.) block = 0.;
1182 } 1205 }
1183 1206
1184 method_poll (EV_A_ block); 1207 method_poll (EV_A_ block);
… …
1186 /* update ev_rt_now, do magic */ 1209 /* update ev_rt_now, do magic */
1187 time_update (EV_A); 1210 time_update (EV_A);
1188 1211
1189 /* queue pending timers and reschedule them */ 1212 /* queue pending timers and reschedule them */
1190 timers_reify (EV_A); /* relative timers called last */ 1213 timers_reify (EV_A); /* relative timers called last */
1214#if EV_PERIODICS
1191 periodics_reify (EV_A); /* absolute timers called first */ 1215 periodics_reify (EV_A); /* absolute timers called first */
1216#endif
1192 1217
1193 /* queue idle watchers unless io or timers are pending */ 1218 /* queue idle watchers unless io or timers are pending */
1194 if (idlecnt && !any_pending (EV_A)) 1219 if (idlecnt && !any_pending (EV_A))
1195 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1220 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1196 1221
… …
1287{ 1312{
1288 ev_clear_pending (EV_A_ (W)w); 1313 ev_clear_pending (EV_A_ (W)w);
1289 if (!ev_is_active (w)) 1314 if (!ev_is_active (w))
1290 return; 1315 return;
1291 1316
1317 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1318
1292 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1319 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1293 ev_stop (EV_A_ (W)w); 1320 ev_stop (EV_A_ (W)w);
1294 1321
1295 fd_change (EV_A_ w->fd); 1322 fd_change (EV_A_ w->fd);
1296} 1323}
… …
1323 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1350 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1324 1351
1325 if (((W)w)->active < timercnt--) 1352 if (((W)w)->active < timercnt--)
1326 { 1353 {
1327 timers [((W)w)->active - 1] = timers [timercnt]; 1354 timers [((W)w)->active - 1] = timers [timercnt];
1328 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1355 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1329 } 1356 }
1330 1357
1331 ((WT)w)->at = w->repeat; 1358 ((WT)w)->at -= mn_now;
1332 1359
1333 ev_stop (EV_A_ (W)w); 1360 ev_stop (EV_A_ (W)w);
1334} 1361}
1335 1362
1336void 1363void
1337ev_timer_again (EV_P_ struct ev_timer *w) 1364ev_timer_again (EV_P_ struct ev_timer *w)
1338{ 1365{
1339 if (ev_is_active (w)) 1366 if (ev_is_active (w))
1340 { 1367 {
1341 if (w->repeat) 1368 if (w->repeat)
1369 {
1370 ((WT)w)->at = mn_now + w->repeat;
1342 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1371 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1372 }
1343 else 1373 else
1344 ev_timer_stop (EV_A_ w); 1374 ev_timer_stop (EV_A_ w);
1345 } 1375 }
1346 else if (w->repeat) 1376 else if (w->repeat)
1347 ev_timer_start (EV_A_ w); 1377 ev_timer_start (EV_A_ w);
1348} 1378}
1349 1379
1380#if EV_PERIODICS
1350void 1381void
1351ev_periodic_start (EV_P_ struct ev_periodic *w) 1382ev_periodic_start (EV_P_ struct ev_periodic *w)
1352{ 1383{
1353 if (ev_is_active (w)) 1384 if (ev_is_active (w))
1354 return; 1385 return;
… …
1380 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1411 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1381 1412
1382 if (((W)w)->active < periodiccnt--) 1413 if (((W)w)->active < periodiccnt--)
1383 { 1414 {
1384 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1415 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1385 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1416 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1386 } 1417 }
1387 1418
1388 ev_stop (EV_A_ (W)w); 1419 ev_stop (EV_A_ (W)w);
1389} 1420}
1390 1421
… …
1393{ 1424{
1394 /* TODO: use adjustheap and recalculation */ 1425 /* TODO: use adjustheap and recalculation */
1395 ev_periodic_stop (EV_A_ w); 1426 ev_periodic_stop (EV_A_ w);
1396 ev_periodic_start (EV_A_ w); 1427 ev_periodic_start (EV_A_ w);
1397} 1428}
1429#endif
1398 1430
1399void 1431void
1400ev_idle_start (EV_P_ struct ev_idle *w) 1432ev_idle_start (EV_P_ struct ev_idle *w)
1401{ 1433{
1402 if (ev_is_active (w)) 1434 if (ev_is_active (w))
… …
1409 1441
1410void 1442void
1411ev_idle_stop (EV_P_ struct ev_idle *w) 1443ev_idle_stop (EV_P_ struct ev_idle *w)
1412{ 1444{
1413 ev_clear_pending (EV_A_ (W)w); 1445 ev_clear_pending (EV_A_ (W)w);
1414 if (ev_is_active (w)) 1446 if (!ev_is_active (w))
1415 return; 1447 return;
1416 1448
1417 idles [((W)w)->active - 1] = idles [--idlecnt]; 1449 idles [((W)w)->active - 1] = idles [--idlecnt];
1418 ev_stop (EV_A_ (W)w); 1450 ev_stop (EV_A_ (W)w);
1419} 1451}
… …
1431 1463
1432void 1464void
1433ev_prepare_stop (EV_P_ struct ev_prepare *w) 1465ev_prepare_stop (EV_P_ struct ev_prepare *w)
1434{ 1466{
1435 ev_clear_pending (EV_A_ (W)w); 1467 ev_clear_pending (EV_A_ (W)w);
1436 if (ev_is_active (w)) 1468 if (!ev_is_active (w))
1437 return; 1469 return;
1438 1470
1439 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1471 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1440 ev_stop (EV_A_ (W)w); 1472 ev_stop (EV_A_ (W)w);
1441} 1473}
… …
1453 1485
1454void 1486void
1455ev_check_stop (EV_P_ struct ev_check *w) 1487ev_check_stop (EV_P_ struct ev_check *w)
1456{ 1488{
1457 ev_clear_pending (EV_A_ (W)w); 1489 ev_clear_pending (EV_A_ (W)w);
1458 if (ev_is_active (w)) 1490 if (!ev_is_active (w))
1459 return; 1491 return;
1460 1492
1461 checks [((W)w)->active - 1] = checks [--checkcnt]; 1493 checks [((W)w)->active - 1] = checks [--checkcnt];
1462 ev_stop (EV_A_ (W)w); 1494 ev_stop (EV_A_ (W)w);
1463} 1495}
… …
1481 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1513 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1482 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1514 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1483 1515
1484 if (!((WL)w)->next) 1516 if (!((WL)w)->next)
1485 { 1517 {
1486#if WIN32 1518#if _WIN32
1487 signal (w->signum, sighandler); 1519 signal (w->signum, sighandler);
1488#else 1520#else
1489 struct sigaction sa; 1521 struct sigaction sa;
1490 sa.sa_handler = sighandler; 1522 sa.sa_handler = sighandler;
1491 sigfillset (&sa.sa_mask); 1523 sigfillset (&sa.sa_mask);
… …
1524 1556
1525void 1557void
1526ev_child_stop (EV_P_ struct ev_child *w) 1558ev_child_stop (EV_P_ struct ev_child *w)
1527{ 1559{
1528 ev_clear_pending (EV_A_ (W)w); 1560 ev_clear_pending (EV_A_ (W)w);
1529 if (ev_is_active (w)) 1561 if (!ev_is_active (w))
1530 return; 1562 return;
1531 1563
1532 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1564 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1533 ev_stop (EV_A_ (W)w); 1565 ev_stop (EV_A_ (W)w);
1534} 1566}
… …
1594 ev_timer_start (EV_A_ &once->to); 1626 ev_timer_start (EV_A_ &once->to);
1595 } 1627 }
1596 } 1628 }
1597} 1629}
1598 1630
1631#ifdef __cplusplus
1632}
1633#endif
1634

Diff Legend

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