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

Comparing libev/ev.c (file contents):
Revision 1.78 by root, Thu Nov 8 21:08:56 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) */
127#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 142#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
128#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 143#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
129/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 144/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
130 145
146#ifdef EV_H
147# include EV_H
148#else
131#include "ev.h" 149# include "ev.h"
150#endif
132 151
133#if __GNUC__ >= 3 152#if __GNUC__ >= 3
134# define expect(expr,value) __builtin_expect ((expr),(value)) 153# define expect(expr,value) __builtin_expect ((expr),(value))
135# define inline inline 154# define inline inline
136#else 155#else
… …
142#define expect_true(expr) expect ((expr) != 0, 1) 161#define expect_true(expr) expect ((expr) != 0, 1)
143 162
144#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 163#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
145#define ABSPRI(w) ((w)->priority - EV_MINPRI) 164#define ABSPRI(w) ((w)->priority - EV_MINPRI)
146 165
166#define EMPTY /* required for microsofts broken pseudo-c compiler */
167
147typedef struct ev_watcher *W; 168typedef struct ev_watcher *W;
148typedef struct ev_watcher_list *WL; 169typedef struct ev_watcher_list *WL;
149typedef struct ev_watcher_time *WT; 170typedef struct ev_watcher_time *WT;
150 171
151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 172static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
152 173
174#ifdef _WIN32
153#include "ev_win32.c" 175# include "ev_win32.c"
176#endif
154 177
155/*****************************************************************************/ 178/*****************************************************************************/
156 179
157static void (*syserr_cb)(const char *msg); 180static void (*syserr_cb)(const char *msg);
158 181
… …
205typedef struct 228typedef struct
206{ 229{
207 WL head; 230 WL head;
208 unsigned char events; 231 unsigned char events;
209 unsigned char reify; 232 unsigned char reify;
233#if EV_SELECT_IS_WINSOCKET
234 SOCKET handle;
235#endif
210} ANFD; 236} ANFD;
211 237
212typedef struct 238typedef struct
213{ 239{
214 W w; 240 W w;
215 int events; 241 int events;
216} ANPENDING; 242} ANPENDING;
217 243
218#if EV_MULTIPLICITY 244#if EV_MULTIPLICITY
219 245
220struct ev_loop 246 struct ev_loop
221{ 247 {
248 ev_tstamp ev_rt_now;
249 #define ev_rt_now ((loop)->ev_rt_now)
222# define VAR(name,decl) decl; 250 #define VAR(name,decl) decl;
223# include "ev_vars.h" 251 #include "ev_vars.h"
224};
225# undef VAR 252 #undef VAR
253 };
226# include "ev_wrap.h" 254 #include "ev_wrap.h"
255
256 struct ev_loop default_loop_struct;
257 static struct ev_loop *default_loop;
227 258
228#else 259#else
229 260
261 ev_tstamp ev_rt_now;
230# define VAR(name,decl) static decl; 262 #define VAR(name,decl) static decl;
231# include "ev_vars.h" 263 #include "ev_vars.h"
232# undef VAR 264 #undef VAR
265
266 static int default_loop;
233 267
234#endif 268#endif
235 269
236/*****************************************************************************/ 270/*****************************************************************************/
237 271
238inline ev_tstamp 272ev_tstamp
239ev_time (void) 273ev_time (void)
240{ 274{
241#if EV_USE_REALTIME 275#if EV_USE_REALTIME
242 struct timespec ts; 276 struct timespec ts;
243 clock_gettime (CLOCK_REALTIME, &ts); 277 clock_gettime (CLOCK_REALTIME, &ts);
… …
262#endif 296#endif
263 297
264 return ev_time (); 298 return ev_time ();
265} 299}
266 300
301#if EV_MULTIPLICITY
267ev_tstamp 302ev_tstamp
268ev_now (EV_P) 303ev_now (EV_P)
269{ 304{
270 return rt_now; 305 return ev_rt_now;
271} 306}
307#endif
272 308
273#define array_roundsize(type,n) ((n) | 4 & ~3) 309#define array_roundsize(type,n) ((n) | 4 & ~3)
274 310
275#define array_needsize(type,base,cur,cnt,init) \ 311#define array_needsize(type,base,cur,cnt,init) \
276 if (expect_false ((cnt) > cur)) \ 312 if (expect_false ((cnt) > cur)) \
… …
293 stem ## max = array_roundsize (stem ## cnt >> 1); \ 329 stem ## max = array_roundsize (stem ## cnt >> 1); \
294 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 330 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
295 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 331 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
296 } 332 }
297 333
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) \ 334#define array_free(stem, idx) \
304 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;
305 336
306/*****************************************************************************/ 337/*****************************************************************************/
307 338
… …
342 373
343 for (i = 0; i < eventcnt; ++i) 374 for (i = 0; i < eventcnt; ++i)
344 ev_feed_event (EV_A_ events [i], type); 375 ev_feed_event (EV_A_ events [i], type);
345} 376}
346 377
347static void 378inline void
348fd_event (EV_P_ int fd, int events) 379fd_event (EV_P_ int fd, int revents)
349{ 380{
350 ANFD *anfd = anfds + fd; 381 ANFD *anfd = anfds + fd;
351 struct ev_io *w; 382 struct ev_io *w;
352 383
353 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 384 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
354 { 385 {
355 int ev = w->events & events; 386 int ev = w->events & revents;
356 387
357 if (ev) 388 if (ev)
358 ev_feed_event (EV_A_ (W)w, ev); 389 ev_feed_event (EV_A_ (W)w, ev);
359 } 390 }
391}
392
393void
394ev_feed_fd_event (EV_P_ int fd, int revents)
395{
396 fd_event (EV_A_ fd, revents);
360} 397}
361 398
362/*****************************************************************************/ 399/*****************************************************************************/
363 400
364static void 401static void
… …
375 int events = 0; 412 int events = 0;
376 413
377 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)
378 events |= w->events; 415 events |= w->events;
379 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
380 anfd->reify = 0; 426 anfd->reify = 0;
381 427
382 method_modify (EV_A_ fd, anfd->events, events); 428 method_modify (EV_A_ fd, anfd->events, events);
383 anfd->events = events; 429 anfd->events = events;
384 } 430 }
… …
412} 458}
413 459
414static int 460static int
415fd_valid (int fd) 461fd_valid (int fd)
416{ 462{
417#ifdef WIN32 463#ifdef _WIN32
418 return !!win32_get_osfhandle (fd); 464 return _get_osfhandle (fd) != -1;
419#else 465#else
420 return fcntl (fd, F_GETFD) != -1; 466 return fcntl (fd, F_GETFD) != -1;
421#endif 467#endif
422} 468}
423 469
… …
503 549
504 heap [k] = w; 550 heap [k] = w;
505 ((W)heap [k])->active = k + 1; 551 ((W)heap [k])->active = k + 1;
506} 552}
507 553
554inline void
555adjustheap (WT *heap, int N, int k)
556{
557 upheap (heap, k);
558 downheap (heap, N, k);
559}
560
508/*****************************************************************************/ 561/*****************************************************************************/
509 562
510typedef struct 563typedef struct
511{ 564{
512 WL head; 565 WL head;
… …
533} 586}
534 587
535static void 588static void
536sighandler (int signum) 589sighandler (int signum)
537{ 590{
538#if WIN32 591#if _WIN32
539 signal (signum, sighandler); 592 signal (signum, sighandler);
540#endif 593#endif
541 594
542 signals [signum - 1].gotsig = 1; 595 signals [signum - 1].gotsig = 1;
543 596
544 if (!gotsig) 597 if (!gotsig)
545 { 598 {
546 int old_errno = errno; 599 int old_errno = errno;
547 gotsig = 1; 600 gotsig = 1;
548#ifdef WIN32
549 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
550#else
551 write (sigpipe [1], &signum, 1); 601 write (sigpipe [1], &signum, 1);
552#endif
553 errno = old_errno; 602 errno = old_errno;
554 } 603 }
555} 604}
556 605
606void
607ev_feed_signal_event (EV_P_ int signum)
608{
609 WL w;
610
611#if EV_MULTIPLICITY
612 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
613#endif
614
615 --signum;
616
617 if (signum < 0 || signum >= signalmax)
618 return;
619
620 signals [signum].gotsig = 0;
621
622 for (w = signals [signum].head; w; w = w->next)
623 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
624}
625
557static void 626static void
558sigcb (EV_P_ struct ev_io *iow, int revents) 627sigcb (EV_P_ struct ev_io *iow, int revents)
559{ 628{
560 WL w;
561 int signum; 629 int signum;
562 630
563#ifdef WIN32
564 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
565#else
566 read (sigpipe [0], &revents, 1); 631 read (sigpipe [0], &revents, 1);
567#endif
568 gotsig = 0; 632 gotsig = 0;
569 633
570 for (signum = signalmax; signum--; ) 634 for (signum = signalmax; signum--; )
571 if (signals [signum].gotsig) 635 if (signals [signum].gotsig)
572 { 636 ev_feed_signal_event (EV_A_ signum + 1);
573 signals [signum].gotsig = 0; 637}
574 638
575 for (w = signals [signum].head; w; w = w->next) 639inline void
576 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 640fd_intern (int fd)
577 } 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
578} 649}
579 650
580static void 651static void
581siginit (EV_P) 652siginit (EV_P)
582{ 653{
583#ifndef WIN32 654 fd_intern (sigpipe [0]);
584 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 655 fd_intern (sigpipe [1]);
585 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
586
587 /* rather than sort out wether we really need nb, set it */
588 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
589 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
590#endif
591 656
592 ev_io_set (&sigev, sigpipe [0], EV_READ); 657 ev_io_set (&sigev, sigpipe [0], EV_READ);
593 ev_io_start (EV_A_ &sigev); 658 ev_io_start (EV_A_ &sigev);
594 ev_unref (EV_A); /* child watcher should not keep loop alive */ 659 ev_unref (EV_A); /* child watcher should not keep loop alive */
595} 660}
596 661
597/*****************************************************************************/ 662/*****************************************************************************/
598 663
599static struct ev_child *childs [PID_HASHSIZE]; 664static struct ev_child *childs [PID_HASHSIZE];
600 665
601#ifndef WIN32 666#ifndef _WIN32
602 667
603static struct ev_signal childev; 668static struct ev_signal childev;
604 669
605#ifndef WCONTINUED 670#ifndef WCONTINUED
606# define WCONTINUED 0 671# define WCONTINUED 0
… …
667 732
668/* 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 */
669static int 734static int
670enable_secure (void) 735enable_secure (void)
671{ 736{
672#ifdef WIN32 737#ifdef _WIN32
673 return 0; 738 return 0;
674#else 739#else
675 return getuid () != geteuid () 740 return getuid () != geteuid ()
676 || getgid () != getegid (); 741 || getgid () != getegid ();
677#endif 742#endif
… …
694 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 759 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
695 have_monotonic = 1; 760 have_monotonic = 1;
696 } 761 }
697#endif 762#endif
698 763
699 rt_now = ev_time (); 764 ev_rt_now = ev_time ();
700 mn_now = get_clock (); 765 mn_now = get_clock ();
701 now_floor = mn_now; 766 now_floor = mn_now;
702 rtmn_diff = rt_now - mn_now; 767 rtmn_diff = ev_rt_now - mn_now;
703 768
704 if (methods == EVMETHOD_AUTO) 769 if (methods == EVMETHOD_AUTO)
705 if (!enable_secure () && getenv ("LIBEV_METHODS")) 770 if (!enable_secure () && getenv ("LIBEV_METHODS"))
706 methods = atoi (getenv ("LIBEV_METHODS")); 771 methods = atoi (getenv ("LIBEV_METHODS"));
707 else 772 else
708 methods = EVMETHOD_ANY; 773 methods = EVMETHOD_ANY;
709 774
710 method = 0; 775 method = 0;
711#if EV_USE_WIN32
712 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
713#endif
714#if EV_USE_KQUEUE 776#if EV_USE_KQUEUE
715 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 777 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
716#endif 778#endif
717#if EV_USE_EPOLL 779#if EV_USE_EPOLL
718 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 780 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
… …
722#endif 784#endif
723#if EV_USE_SELECT 785#if EV_USE_SELECT
724 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 786 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
725#endif 787#endif
726 788
727 ev_watcher_init (&sigev, sigcb); 789 ev_init (&sigev, sigcb);
728 ev_set_priority (&sigev, EV_MAXPRI); 790 ev_set_priority (&sigev, EV_MAXPRI);
729 } 791 }
730} 792}
731 793
732void 794void
733loop_destroy (EV_P) 795loop_destroy (EV_P)
734{ 796{
735 int i; 797 int i;
736 798
737#if EV_USE_WIN32
738 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
739#endif
740#if EV_USE_KQUEUE 799#if EV_USE_KQUEUE
741 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 800 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
742#endif 801#endif
743#if EV_USE_EPOLL 802#if EV_USE_EPOLL
744 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 803 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
752 811
753 for (i = NUMPRI; i--; ) 812 for (i = NUMPRI; i--; )
754 array_free (pending, [i]); 813 array_free (pending, [i]);
755 814
756 /* have to use the microsoft-never-gets-it-right macro */ 815 /* have to use the microsoft-never-gets-it-right macro */
757 array_free_microshit (fdchange); 816 array_free (fdchange, EMPTY);
758 array_free_microshit (timer); 817 array_free (timer, EMPTY);
759 array_free_microshit (periodic); 818#if EV_PERIODICS
760 array_free_microshit (idle); 819 array_free (periodic, EMPTY);
761 array_free_microshit (prepare); 820#endif
762 array_free_microshit (check); 821 array_free (idle, EMPTY);
822 array_free (prepare, EMPTY);
823 array_free (check, EMPTY);
763 824
764 method = 0; 825 method = 0;
765} 826}
766 827
767static void 828static void
… …
822} 883}
823 884
824#endif 885#endif
825 886
826#if EV_MULTIPLICITY 887#if EV_MULTIPLICITY
827struct ev_loop default_loop_struct;
828static struct ev_loop *default_loop;
829
830struct ev_loop * 888struct ev_loop *
831#else 889#else
832static int default_loop;
833
834int 890int
835#endif 891#endif
836ev_default_loop (int methods) 892ev_default_loop (int methods)
837{ 893{
838 if (sigpipe [0] == sigpipe [1]) 894 if (sigpipe [0] == sigpipe [1])
… …
851 907
852 if (ev_method (EV_A)) 908 if (ev_method (EV_A))
853 { 909 {
854 siginit (EV_A); 910 siginit (EV_A);
855 911
856#ifndef WIN32 912#ifndef _WIN32
857 ev_signal_init (&childev, childcb, SIGCHLD); 913 ev_signal_init (&childev, childcb, SIGCHLD);
858 ev_set_priority (&childev, EV_MAXPRI); 914 ev_set_priority (&childev, EV_MAXPRI);
859 ev_signal_start (EV_A_ &childev); 915 ev_signal_start (EV_A_ &childev);
860 ev_unref (EV_A); /* child watcher should not keep loop alive */ 916 ev_unref (EV_A); /* child watcher should not keep loop alive */
861#endif 917#endif
… …
872{ 928{
873#if EV_MULTIPLICITY 929#if EV_MULTIPLICITY
874 struct ev_loop *loop = default_loop; 930 struct ev_loop *loop = default_loop;
875#endif 931#endif
876 932
877#ifndef WIN32 933#ifndef _WIN32
878 ev_ref (EV_A); /* child watcher */ 934 ev_ref (EV_A); /* child watcher */
879 ev_signal_stop (EV_A_ &childev); 935 ev_signal_stop (EV_A_ &childev);
880#endif 936#endif
881 937
882 ev_ref (EV_A); /* signal watcher */ 938 ev_ref (EV_A); /* signal watcher */
… …
924 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 980 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
925 981
926 if (p->w) 982 if (p->w)
927 { 983 {
928 p->w->pending = 0; 984 p->w->pending = 0;
929 p->w->cb (EV_A_ p->w, p->events); 985 EV_CB_INVOKE (p->w, p->events);
930 } 986 }
931 } 987 }
932} 988}
933 989
934static void 990static void
… …
942 998
943 /* first reschedule or stop timer */ 999 /* first reschedule or stop timer */
944 if (w->repeat) 1000 if (w->repeat)
945 { 1001 {
946 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
947 ((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
948 downheap ((WT *)timers, timercnt, 0); 1008 downheap ((WT *)timers, timercnt, 0);
949 } 1009 }
950 else 1010 else
951 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1011 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
952 1012
953 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1013 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
954 } 1014 }
955} 1015}
956 1016
1017#if EV_PERIODICS
957static void 1018static void
958periodics_reify (EV_P) 1019periodics_reify (EV_P)
959{ 1020{
960 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1021 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
961 { 1022 {
962 struct ev_periodic *w = periodics [0]; 1023 struct ev_periodic *w = periodics [0];
963 1024
964 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1025 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
965 1026
966 /* first reschedule or stop timer */ 1027 /* first reschedule or stop timer */
967 if (w->reschedule_cb) 1028 if (w->reschedule_cb)
968 { 1029 {
969 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1030 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
970 1031
971 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1032 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
972 downheap ((WT *)periodics, periodiccnt, 0); 1033 downheap ((WT *)periodics, periodiccnt, 0);
973 } 1034 }
974 else if (w->interval) 1035 else if (w->interval)
975 { 1036 {
976 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1037 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
977 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1038 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
978 downheap ((WT *)periodics, periodiccnt, 0); 1039 downheap ((WT *)periodics, periodiccnt, 0);
979 } 1040 }
980 else 1041 else
981 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1042 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
982 1043
… …
993 for (i = 0; i < periodiccnt; ++i) 1054 for (i = 0; i < periodiccnt; ++i)
994 { 1055 {
995 struct ev_periodic *w = periodics [i]; 1056 struct ev_periodic *w = periodics [i];
996 1057
997 if (w->reschedule_cb) 1058 if (w->reschedule_cb)
998 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1059 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
999 else if (w->interval) 1060 else if (w->interval)
1000 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1061 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1001 } 1062 }
1002 1063
1003 /* now rebuild the heap */ 1064 /* now rebuild the heap */
1004 for (i = periodiccnt >> 1; i--; ) 1065 for (i = periodiccnt >> 1; i--; )
1005 downheap ((WT *)periodics, periodiccnt, i); 1066 downheap ((WT *)periodics, periodiccnt, i);
1006} 1067}
1068#endif
1007 1069
1008inline int 1070inline int
1009time_update_monotonic (EV_P) 1071time_update_monotonic (EV_P)
1010{ 1072{
1011 mn_now = get_clock (); 1073 mn_now = get_clock ();
1012 1074
1013 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1075 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1014 { 1076 {
1015 rt_now = rtmn_diff + mn_now; 1077 ev_rt_now = rtmn_diff + mn_now;
1016 return 0; 1078 return 0;
1017 } 1079 }
1018 else 1080 else
1019 { 1081 {
1020 now_floor = mn_now; 1082 now_floor = mn_now;
1021 rt_now = ev_time (); 1083 ev_rt_now = ev_time ();
1022 return 1; 1084 return 1;
1023 } 1085 }
1024} 1086}
1025 1087
1026static void 1088static void
… …
1035 { 1097 {
1036 ev_tstamp odiff = rtmn_diff; 1098 ev_tstamp odiff = rtmn_diff;
1037 1099
1038 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1100 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1039 { 1101 {
1040 rtmn_diff = rt_now - mn_now; 1102 rtmn_diff = ev_rt_now - mn_now;
1041 1103
1042 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1104 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1043 return; /* all is well */ 1105 return; /* all is well */
1044 1106
1045 rt_now = ev_time (); 1107 ev_rt_now = ev_time ();
1046 mn_now = get_clock (); 1108 mn_now = get_clock ();
1047 now_floor = mn_now; 1109 now_floor = mn_now;
1048 } 1110 }
1049 1111
1112# if EV_PERIODICS
1050 periodics_reschedule (EV_A); 1113 periodics_reschedule (EV_A);
1114# endif
1051 /* no timer adjustment, as the monotonic clock doesn't jump */ 1115 /* no timer adjustment, as the monotonic clock doesn't jump */
1052 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1116 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1053 } 1117 }
1054 } 1118 }
1055 else 1119 else
1056#endif 1120#endif
1057 { 1121 {
1058 rt_now = ev_time (); 1122 ev_rt_now = ev_time ();
1059 1123
1060 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1124 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1061 { 1125 {
1126#if EV_PERIODICS
1062 periodics_reschedule (EV_A); 1127 periodics_reschedule (EV_A);
1128#endif
1063 1129
1064 /* 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 */
1065 for (i = 0; i < timercnt; ++i) 1131 for (i = 0; i < timercnt; ++i)
1066 ((WT)timers [i])->at += rt_now - mn_now; 1132 ((WT)timers [i])->at += ev_rt_now - mn_now;
1067 } 1133 }
1068 1134
1069 mn_now = rt_now; 1135 mn_now = ev_rt_now;
1070 } 1136 }
1071} 1137}
1072 1138
1073void 1139void
1074ev_ref (EV_P) 1140ev_ref (EV_P)
… …
1114 if (expect_true (have_monotonic)) 1180 if (expect_true (have_monotonic))
1115 time_update_monotonic (EV_A); 1181 time_update_monotonic (EV_A);
1116 else 1182 else
1117#endif 1183#endif
1118 { 1184 {
1119 rt_now = ev_time (); 1185 ev_rt_now = ev_time ();
1120 mn_now = rt_now; 1186 mn_now = ev_rt_now;
1121 } 1187 }
1122 1188
1123 if (flags & EVLOOP_NONBLOCK || idlecnt) 1189 if (flags & EVLOOP_NONBLOCK || idlecnt)
1124 block = 0.; 1190 block = 0.;
1125 else 1191 else
… …
1130 { 1196 {
1131 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1197 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1132 if (block > to) block = to; 1198 if (block > to) block = to;
1133 } 1199 }
1134 1200
1201#if EV_PERIODICS
1135 if (periodiccnt) 1202 if (periodiccnt)
1136 { 1203 {
1137 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1204 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1138 if (block > to) block = to; 1205 if (block > to) block = to;
1139 } 1206 }
1207#endif
1140 1208
1141 if (block < 0.) block = 0.; 1209 if (block < 0.) block = 0.;
1142 } 1210 }
1143 1211
1144 method_poll (EV_A_ block); 1212 method_poll (EV_A_ block);
1145 1213
1146 /* update rt_now, do magic */ 1214 /* update ev_rt_now, do magic */
1147 time_update (EV_A); 1215 time_update (EV_A);
1148 1216
1149 /* queue pending timers and reschedule them */ 1217 /* queue pending timers and reschedule them */
1150 timers_reify (EV_A); /* relative timers called last */ 1218 timers_reify (EV_A); /* relative timers called last */
1219#if EV_PERIODICS
1151 periodics_reify (EV_A); /* absolute timers called first */ 1220 periodics_reify (EV_A); /* absolute timers called first */
1221#endif
1152 1222
1153 /* queue idle watchers unless io or timers are pending */ 1223 /* queue idle watchers unless io or timers are pending */
1154 if (idlecnt && !any_pending (EV_A)) 1224 if (idlecnt && !any_pending (EV_A))
1155 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1225 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1156 1226
… …
1247{ 1317{
1248 ev_clear_pending (EV_A_ (W)w); 1318 ev_clear_pending (EV_A_ (W)w);
1249 if (!ev_is_active (w)) 1319 if (!ev_is_active (w))
1250 return; 1320 return;
1251 1321
1322 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1323
1252 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1324 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1253 ev_stop (EV_A_ (W)w); 1325 ev_stop (EV_A_ (W)w);
1254 1326
1255 fd_change (EV_A_ w->fd); 1327 fd_change (EV_A_ w->fd);
1256} 1328}
… …
1283 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1355 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1284 1356
1285 if (((W)w)->active < timercnt--) 1357 if (((W)w)->active < timercnt--)
1286 { 1358 {
1287 timers [((W)w)->active - 1] = timers [timercnt]; 1359 timers [((W)w)->active - 1] = timers [timercnt];
1288 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1360 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1289 } 1361 }
1290 1362
1291 ((WT)w)->at = w->repeat; 1363 ((WT)w)->at -= mn_now;
1292 1364
1293 ev_stop (EV_A_ (W)w); 1365 ev_stop (EV_A_ (W)w);
1294} 1366}
1295 1367
1296void 1368void
… …
1299 if (ev_is_active (w)) 1371 if (ev_is_active (w))
1300 { 1372 {
1301 if (w->repeat) 1373 if (w->repeat)
1302 { 1374 {
1303 ((WT)w)->at = mn_now + w->repeat; 1375 ((WT)w)->at = mn_now + w->repeat;
1304 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1376 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1305 } 1377 }
1306 else 1378 else
1307 ev_timer_stop (EV_A_ w); 1379 ev_timer_stop (EV_A_ w);
1308 } 1380 }
1309 else if (w->repeat) 1381 else if (w->repeat)
1310 ev_timer_start (EV_A_ w); 1382 ev_timer_start (EV_A_ w);
1311} 1383}
1312 1384
1385#if EV_PERIODICS
1313void 1386void
1314ev_periodic_start (EV_P_ struct ev_periodic *w) 1387ev_periodic_start (EV_P_ struct ev_periodic *w)
1315{ 1388{
1316 if (ev_is_active (w)) 1389 if (ev_is_active (w))
1317 return; 1390 return;
1318 1391
1319 if (w->reschedule_cb) 1392 if (w->reschedule_cb)
1320 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1393 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1321 else if (w->interval) 1394 else if (w->interval)
1322 { 1395 {
1323 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1396 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1324 /* this formula differs from the one in periodic_reify because we do not always round up */ 1397 /* this formula differs from the one in periodic_reify because we do not always round up */
1325 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1398 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1326 } 1399 }
1327 1400
1328 ev_start (EV_A_ (W)w, ++periodiccnt); 1401 ev_start (EV_A_ (W)w, ++periodiccnt);
1329 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1402 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1330 periodics [periodiccnt - 1] = w; 1403 periodics [periodiccnt - 1] = w;
… …
1343 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1416 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1344 1417
1345 if (((W)w)->active < periodiccnt--) 1418 if (((W)w)->active < periodiccnt--)
1346 { 1419 {
1347 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1420 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1348 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1421 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1349 } 1422 }
1350 1423
1351 ev_stop (EV_A_ (W)w); 1424 ev_stop (EV_A_ (W)w);
1352} 1425}
1353 1426
1354void 1427void
1355ev_periodic_again (EV_P_ struct ev_periodic *w) 1428ev_periodic_again (EV_P_ struct ev_periodic *w)
1356{ 1429{
1430 /* TODO: use adjustheap and recalculation */
1357 ev_periodic_stop (EV_A_ w); 1431 ev_periodic_stop (EV_A_ w);
1358 ev_periodic_start (EV_A_ w); 1432 ev_periodic_start (EV_A_ w);
1359} 1433}
1434#endif
1360 1435
1361void 1436void
1362ev_idle_start (EV_P_ struct ev_idle *w) 1437ev_idle_start (EV_P_ struct ev_idle *w)
1363{ 1438{
1364 if (ev_is_active (w)) 1439 if (ev_is_active (w))
… …
1371 1446
1372void 1447void
1373ev_idle_stop (EV_P_ struct ev_idle *w) 1448ev_idle_stop (EV_P_ struct ev_idle *w)
1374{ 1449{
1375 ev_clear_pending (EV_A_ (W)w); 1450 ev_clear_pending (EV_A_ (W)w);
1376 if (ev_is_active (w)) 1451 if (!ev_is_active (w))
1377 return; 1452 return;
1378 1453
1379 idles [((W)w)->active - 1] = idles [--idlecnt]; 1454 idles [((W)w)->active - 1] = idles [--idlecnt];
1380 ev_stop (EV_A_ (W)w); 1455 ev_stop (EV_A_ (W)w);
1381} 1456}
… …
1393 1468
1394void 1469void
1395ev_prepare_stop (EV_P_ struct ev_prepare *w) 1470ev_prepare_stop (EV_P_ struct ev_prepare *w)
1396{ 1471{
1397 ev_clear_pending (EV_A_ (W)w); 1472 ev_clear_pending (EV_A_ (W)w);
1398 if (ev_is_active (w)) 1473 if (!ev_is_active (w))
1399 return; 1474 return;
1400 1475
1401 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1476 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1402 ev_stop (EV_A_ (W)w); 1477 ev_stop (EV_A_ (W)w);
1403} 1478}
… …
1415 1490
1416void 1491void
1417ev_check_stop (EV_P_ struct ev_check *w) 1492ev_check_stop (EV_P_ struct ev_check *w)
1418{ 1493{
1419 ev_clear_pending (EV_A_ (W)w); 1494 ev_clear_pending (EV_A_ (W)w);
1420 if (ev_is_active (w)) 1495 if (!ev_is_active (w))
1421 return; 1496 return;
1422 1497
1423 checks [((W)w)->active - 1] = checks [--checkcnt]; 1498 checks [((W)w)->active - 1] = checks [--checkcnt];
1424 ev_stop (EV_A_ (W)w); 1499 ev_stop (EV_A_ (W)w);
1425} 1500}
… …
1443 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1518 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1444 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1519 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1445 1520
1446 if (!((WL)w)->next) 1521 if (!((WL)w)->next)
1447 { 1522 {
1448#if WIN32 1523#if _WIN32
1449 signal (w->signum, sighandler); 1524 signal (w->signum, sighandler);
1450#else 1525#else
1451 struct sigaction sa; 1526 struct sigaction sa;
1452 sa.sa_handler = sighandler; 1527 sa.sa_handler = sighandler;
1453 sigfillset (&sa.sa_mask); 1528 sigfillset (&sa.sa_mask);
… …
1486 1561
1487void 1562void
1488ev_child_stop (EV_P_ struct ev_child *w) 1563ev_child_stop (EV_P_ struct ev_child *w)
1489{ 1564{
1490 ev_clear_pending (EV_A_ (W)w); 1565 ev_clear_pending (EV_A_ (W)w);
1491 if (ev_is_active (w)) 1566 if (!ev_is_active (w))
1492 return; 1567 return;
1493 1568
1494 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1569 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1495 ev_stop (EV_A_ (W)w); 1570 ev_stop (EV_A_ (W)w);
1496} 1571}
… …
1540 else 1615 else
1541 { 1616 {
1542 once->cb = cb; 1617 once->cb = cb;
1543 once->arg = arg; 1618 once->arg = arg;
1544 1619
1545 ev_watcher_init (&once->io, once_cb_io); 1620 ev_init (&once->io, once_cb_io);
1546 if (fd >= 0) 1621 if (fd >= 0)
1547 { 1622 {
1548 ev_io_set (&once->io, fd, events); 1623 ev_io_set (&once->io, fd, events);
1549 ev_io_start (EV_A_ &once->io); 1624 ev_io_start (EV_A_ &once->io);
1550 } 1625 }
1551 1626
1552 ev_watcher_init (&once->to, once_cb_to); 1627 ev_init (&once->to, once_cb_to);
1553 if (timeout >= 0.) 1628 if (timeout >= 0.)
1554 { 1629 {
1555 ev_timer_set (&once->to, timeout, 0.); 1630 ev_timer_set (&once->to, timeout, 0.);
1556 ev_timer_start (EV_A_ &once->to); 1631 ev_timer_start (EV_A_ &once->to);
1557 } 1632 }
1558 } 1633 }
1559} 1634}
1560 1635
1636#ifdef __cplusplus
1637}
1638#endif
1639

Diff Legend

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