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

Comparing libev/ev.c (file contents):
Revision 1.80 by root, Fri Nov 9 15:30:59 2007 UTC vs.
Revision 1.118 by root, Fri Nov 16 01:33:54 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
62# endif
63
64# if HAVE_PORT_H && HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT)
65# define EV_USE_PORT 1
53# endif 66# endif
54 67
55#endif 68#endif
56 69
57#include <math.h> 70#include <math.h>
… …
66#include <sys/types.h> 79#include <sys/types.h>
67#include <time.h> 80#include <time.h>
68 81
69#include <signal.h> 82#include <signal.h>
70 83
71#ifndef WIN32 84#ifndef _WIN32
72# include <unistd.h> 85# include <unistd.h>
73# include <sys/time.h> 86# include <sys/time.h>
74# include <sys/wait.h> 87# include <sys/wait.h>
88#else
89# define WIN32_LEAN_AND_MEAN
90# include <windows.h>
91# ifndef EV_SELECT_IS_WINSOCKET
92# define EV_SELECT_IS_WINSOCKET 1
75#endif 93# endif
94#endif
95
76/**/ 96/**/
77 97
78#ifndef EV_USE_MONOTONIC 98#ifndef EV_USE_MONOTONIC
79# define EV_USE_MONOTONIC 1 99# define EV_USE_MONOTONIC 1
80#endif 100#endif
81 101
102#ifndef EV_USE_REALTIME
103# define EV_USE_REALTIME 1
104#endif
105
82#ifndef EV_USE_SELECT 106#ifndef EV_USE_SELECT
83# define EV_USE_SELECT 1 107# define EV_USE_SELECT 1
108# define EV_SELECT_USE_FD_SET 1
84#endif 109#endif
85 110
86#ifndef EV_USE_POLL 111#ifndef EV_USE_POLL
87# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 112# ifdef _WIN32
113# define EV_USE_POLL 0
114# else
115# define EV_USE_POLL 1
116# endif
88#endif 117#endif
89 118
90#ifndef EV_USE_EPOLL 119#ifndef EV_USE_EPOLL
91# define EV_USE_EPOLL 0 120# define EV_USE_EPOLL 0
92#endif 121#endif
93 122
94#ifndef EV_USE_KQUEUE 123#ifndef EV_USE_KQUEUE
95# define EV_USE_KQUEUE 0 124# define EV_USE_KQUEUE 0
96#endif 125#endif
97 126
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 127#ifndef EV_USE_PORT
109# define EV_USE_REALTIME 1 128# define EV_USE_PORT 0
110#endif 129#endif
111 130
112/**/ 131/**/
132
133/* darwin simply cannot be helped */
134#ifdef __APPLE__
135# undef EV_USE_POLL
136# undef EV_USE_KQUEUE
137#endif
113 138
114#ifndef CLOCK_MONOTONIC 139#ifndef CLOCK_MONOTONIC
115# undef EV_USE_MONOTONIC 140# undef EV_USE_MONOTONIC
116# define EV_USE_MONOTONIC 0 141# define EV_USE_MONOTONIC 0
117#endif 142#endif
118 143
119#ifndef CLOCK_REALTIME 144#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 145# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 146# define EV_USE_REALTIME 0
147#endif
148
149#if EV_SELECT_IS_WINSOCKET
150# include <winsock.h>
122#endif 151#endif
123 152
124/**/ 153/**/
125 154
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 155#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) */ 156#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 */ 157#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 */ 158/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
130 159
160#ifdef EV_H
161# include EV_H
162#else
131#include "ev.h" 163# include "ev.h"
164#endif
132 165
133#if __GNUC__ >= 3 166#if __GNUC__ >= 3
134# define expect(expr,value) __builtin_expect ((expr),(value)) 167# define expect(expr,value) __builtin_expect ((expr),(value))
135# define inline inline 168# define inline inline
136#else 169#else
… …
142#define expect_true(expr) expect ((expr) != 0, 1) 175#define expect_true(expr) expect ((expr) != 0, 1)
143 176
144#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 177#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
145#define ABSPRI(w) ((w)->priority - EV_MINPRI) 178#define ABSPRI(w) ((w)->priority - EV_MINPRI)
146 179
180#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
181#define EMPTY2(a,b) /* used to suppress some warnings */
182
147typedef struct ev_watcher *W; 183typedef struct ev_watcher *W;
148typedef struct ev_watcher_list *WL; 184typedef struct ev_watcher_list *WL;
149typedef struct ev_watcher_time *WT; 185typedef struct ev_watcher_time *WT;
150 186
151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 187static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
152 188
189#ifdef _WIN32
153#include "ev_win32.c" 190# include "ev_win32.c"
191#endif
154 192
155/*****************************************************************************/ 193/*****************************************************************************/
156 194
157static void (*syserr_cb)(const char *msg); 195static void (*syserr_cb)(const char *msg);
158 196
… …
205typedef struct 243typedef struct
206{ 244{
207 WL head; 245 WL head;
208 unsigned char events; 246 unsigned char events;
209 unsigned char reify; 247 unsigned char reify;
248#if EV_SELECT_IS_WINSOCKET
249 SOCKET handle;
250#endif
210} ANFD; 251} ANFD;
211 252
212typedef struct 253typedef struct
213{ 254{
214 W w; 255 W w;
… …
217 258
218#if EV_MULTIPLICITY 259#if EV_MULTIPLICITY
219 260
220 struct ev_loop 261 struct ev_loop
221 { 262 {
263 ev_tstamp ev_rt_now;
264 #define ev_rt_now ((loop)->ev_rt_now)
222 #define VAR(name,decl) decl; 265 #define VAR(name,decl) decl;
223 #include "ev_vars.h" 266 #include "ev_vars.h"
224 #undef VAR 267 #undef VAR
225 }; 268 };
226 #include "ev_wrap.h" 269 #include "ev_wrap.h"
227 270
228 struct ev_loop default_loop_struct; 271 static struct ev_loop default_loop_struct;
229 static struct ev_loop *default_loop; 272 struct ev_loop *ev_default_loop_ptr;
230 273
231#else 274#else
232 275
276 ev_tstamp ev_rt_now;
233 #define VAR(name,decl) static decl; 277 #define VAR(name,decl) static decl;
234 #include "ev_vars.h" 278 #include "ev_vars.h"
235 #undef VAR 279 #undef VAR
236 280
237 static int default_loop; 281 static int ev_default_loop_ptr;
238 282
239#endif 283#endif
240 284
241/*****************************************************************************/ 285/*****************************************************************************/
242 286
243inline ev_tstamp 287ev_tstamp
244ev_time (void) 288ev_time (void)
245{ 289{
246#if EV_USE_REALTIME 290#if EV_USE_REALTIME
247 struct timespec ts; 291 struct timespec ts;
248 clock_gettime (CLOCK_REALTIME, &ts); 292 clock_gettime (CLOCK_REALTIME, &ts);
… …
267#endif 311#endif
268 312
269 return ev_time (); 313 return ev_time ();
270} 314}
271 315
316#if EV_MULTIPLICITY
272ev_tstamp 317ev_tstamp
273ev_now (EV_P) 318ev_now (EV_P)
274{ 319{
275 return rt_now; 320 return ev_rt_now;
276} 321}
322#endif
277 323
278#define array_roundsize(type,n) ((n) | 4 & ~3) 324#define array_roundsize(type,n) (((n) | 4) & ~3)
279 325
280#define array_needsize(type,base,cur,cnt,init) \ 326#define array_needsize(type,base,cur,cnt,init) \
281 if (expect_false ((cnt) > cur)) \ 327 if (expect_false ((cnt) > cur)) \
282 { \ 328 { \
283 int newcnt = cur; \ 329 int newcnt = cur; \
… …
298 stem ## max = array_roundsize (stem ## cnt >> 1); \ 344 stem ## max = array_roundsize (stem ## cnt >> 1); \
299 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 345 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
300 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 346 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
301 } 347 }
302 348
303/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
304/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
305#define array_free_microshit(stem) \
306 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
307
308#define array_free(stem, idx) \ 349#define array_free(stem, idx) \
309 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 350 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
310 351
311/*****************************************************************************/ 352/*****************************************************************************/
312 353
… …
333 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 374 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
334 return; 375 return;
335 } 376 }
336 377
337 w_->pending = ++pendingcnt [ABSPRI (w_)]; 378 w_->pending = ++pendingcnt [ABSPRI (w_)];
338 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 379 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
339 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 380 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
340 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 381 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
341} 382}
342 383
343static void 384static void
… …
386 int events = 0; 427 int events = 0;
387 428
388 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 429 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
389 events |= w->events; 430 events |= w->events;
390 431
432#if EV_SELECT_IS_WINSOCKET
433 if (events)
434 {
435 unsigned long argp;
436 anfd->handle = _get_osfhandle (fd);
437 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
438 }
439#endif
440
391 anfd->reify = 0; 441 anfd->reify = 0;
392 442
393 method_modify (EV_A_ fd, anfd->events, events); 443 method_modify (EV_A_ fd, anfd->events, events);
394 anfd->events = events; 444 anfd->events = events;
395 } 445 }
… …
404 return; 454 return;
405 455
406 anfds [fd].reify = 1; 456 anfds [fd].reify = 1;
407 457
408 ++fdchangecnt; 458 ++fdchangecnt;
409 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 459 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
410 fdchanges [fdchangecnt - 1] = fd; 460 fdchanges [fdchangecnt - 1] = fd;
411} 461}
412 462
413static void 463static void
414fd_kill (EV_P_ int fd) 464fd_kill (EV_P_ int fd)
… …
423} 473}
424 474
425static int 475static int
426fd_valid (int fd) 476fd_valid (int fd)
427{ 477{
428#ifdef WIN32 478#ifdef _WIN32
429 return !!win32_get_osfhandle (fd); 479 return _get_osfhandle (fd) != -1;
430#else 480#else
431 return fcntl (fd, F_GETFD) != -1; 481 return fcntl (fd, F_GETFD) != -1;
432#endif 482#endif
433} 483}
434 484
… …
514 564
515 heap [k] = w; 565 heap [k] = w;
516 ((W)heap [k])->active = k + 1; 566 ((W)heap [k])->active = k + 1;
517} 567}
518 568
569inline void
570adjustheap (WT *heap, int N, int k)
571{
572 upheap (heap, k);
573 downheap (heap, N, k);
574}
575
519/*****************************************************************************/ 576/*****************************************************************************/
520 577
521typedef struct 578typedef struct
522{ 579{
523 WL head; 580 WL head;
… …
544} 601}
545 602
546static void 603static void
547sighandler (int signum) 604sighandler (int signum)
548{ 605{
549#if WIN32 606#if _WIN32
550 signal (signum, sighandler); 607 signal (signum, sighandler);
551#endif 608#endif
552 609
553 signals [signum - 1].gotsig = 1; 610 signals [signum - 1].gotsig = 1;
554 611
555 if (!gotsig) 612 if (!gotsig)
556 { 613 {
557 int old_errno = errno; 614 int old_errno = errno;
558 gotsig = 1; 615 gotsig = 1;
559#ifdef WIN32
560 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
561#else
562 write (sigpipe [1], &signum, 1); 616 write (sigpipe [1], &signum, 1);
563#endif
564 errno = old_errno; 617 errno = old_errno;
565 } 618 }
566} 619}
567 620
568void 621void
569ev_feed_signal_event (EV_P_ int signum) 622ev_feed_signal_event (EV_P_ int signum)
570{ 623{
571 WL w; 624 WL w;
572 625
573#if EV_MULTIPLICITY 626#if EV_MULTIPLICITY
574 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 627 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
575#endif 628#endif
576 629
577 --signum; 630 --signum;
578 631
579 if (signum < 0 || signum >= signalmax) 632 if (signum < 0 || signum >= signalmax)
… …
588static void 641static void
589sigcb (EV_P_ struct ev_io *iow, int revents) 642sigcb (EV_P_ struct ev_io *iow, int revents)
590{ 643{
591 int signum; 644 int signum;
592 645
593#ifdef WIN32
594 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
595#else
596 read (sigpipe [0], &revents, 1); 646 read (sigpipe [0], &revents, 1);
597#endif
598 gotsig = 0; 647 gotsig = 0;
599 648
600 for (signum = signalmax; signum--; ) 649 for (signum = signalmax; signum--; )
601 if (signals [signum].gotsig) 650 if (signals [signum].gotsig)
602 ev_feed_signal_event (EV_A_ signum + 1); 651 ev_feed_signal_event (EV_A_ signum + 1);
603} 652}
604 653
654inline void
655fd_intern (int fd)
656{
657#ifdef _WIN32
658 int arg = 1;
659 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
660#else
661 fcntl (fd, F_SETFD, FD_CLOEXEC);
662 fcntl (fd, F_SETFL, O_NONBLOCK);
663#endif
664}
665
605static void 666static void
606siginit (EV_P) 667siginit (EV_P)
607{ 668{
608#ifndef WIN32 669 fd_intern (sigpipe [0]);
609 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 670 fd_intern (sigpipe [1]);
610 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
611
612 /* rather than sort out wether we really need nb, set it */
613 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
614 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
615#endif
616 671
617 ev_io_set (&sigev, sigpipe [0], EV_READ); 672 ev_io_set (&sigev, sigpipe [0], EV_READ);
618 ev_io_start (EV_A_ &sigev); 673 ev_io_start (EV_A_ &sigev);
619 ev_unref (EV_A); /* child watcher should not keep loop alive */ 674 ev_unref (EV_A); /* child watcher should not keep loop alive */
620} 675}
621 676
622/*****************************************************************************/ 677/*****************************************************************************/
623 678
624static struct ev_child *childs [PID_HASHSIZE]; 679static struct ev_child *childs [PID_HASHSIZE];
625 680
626#ifndef WIN32 681#ifndef _WIN32
627 682
628static struct ev_signal childev; 683static struct ev_signal childev;
629 684
630#ifndef WCONTINUED 685#ifndef WCONTINUED
631# define WCONTINUED 0 686# define WCONTINUED 0
… …
663 718
664#endif 719#endif
665 720
666/*****************************************************************************/ 721/*****************************************************************************/
667 722
723#if EV_USE_PORT
724# include "ev_port.c"
725#endif
668#if EV_USE_KQUEUE 726#if EV_USE_KQUEUE
669# include "ev_kqueue.c" 727# include "ev_kqueue.c"
670#endif 728#endif
671#if EV_USE_EPOLL 729#if EV_USE_EPOLL
672# include "ev_epoll.c" 730# include "ev_epoll.c"
… …
692 750
693/* return true if we are running with elevated privileges and should ignore env variables */ 751/* return true if we are running with elevated privileges and should ignore env variables */
694static int 752static int
695enable_secure (void) 753enable_secure (void)
696{ 754{
697#ifdef WIN32 755#ifdef _WIN32
698 return 0; 756 return 0;
699#else 757#else
700 return getuid () != geteuid () 758 return getuid () != geteuid ()
701 || getgid () != getegid (); 759 || getgid () != getegid ();
702#endif 760#endif
703} 761}
704 762
705int 763unsigned int
706ev_method (EV_P) 764ev_method (EV_P)
707{ 765{
708 return method; 766 return method;
709} 767}
710 768
711static void 769static void
712loop_init (EV_P_ int methods) 770loop_init (EV_P_ unsigned int flags)
713{ 771{
714 if (!method) 772 if (!method)
715 { 773 {
716#if EV_USE_MONOTONIC 774#if EV_USE_MONOTONIC
717 { 775 {
… …
719 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 777 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
720 have_monotonic = 1; 778 have_monotonic = 1;
721 } 779 }
722#endif 780#endif
723 781
724 rt_now = ev_time (); 782 ev_rt_now = ev_time ();
725 mn_now = get_clock (); 783 mn_now = get_clock ();
726 now_floor = mn_now; 784 now_floor = mn_now;
727 rtmn_diff = rt_now - mn_now; 785 rtmn_diff = ev_rt_now - mn_now;
728 786
729 if (methods == EVMETHOD_AUTO) 787 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
730 if (!enable_secure () && getenv ("LIBEV_METHODS"))
731 methods = atoi (getenv ("LIBEV_METHODS")); 788 flags = atoi (getenv ("LIBEV_FLAGS"));
732 else 789
733 methods = EVMETHOD_ANY; 790 if (!(flags & 0x0000ffff))
791 flags |= 0x0000ffff;
734 792
735 method = 0; 793 method = 0;
736#if EV_USE_WIN32 794#if EV_USE_PORT
737 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 795 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
738#endif 796#endif
739#if EV_USE_KQUEUE 797#if EV_USE_KQUEUE
740 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 798 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
741#endif 799#endif
742#if EV_USE_EPOLL 800#if EV_USE_EPOLL
743 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 801 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
744#endif 802#endif
745#if EV_USE_POLL 803#if EV_USE_POLL
746 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 804 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
747#endif 805#endif
748#if EV_USE_SELECT 806#if EV_USE_SELECT
749 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 807 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
750#endif 808#endif
751 809
752 ev_watcher_init (&sigev, sigcb); 810 ev_init (&sigev, sigcb);
753 ev_set_priority (&sigev, EV_MAXPRI); 811 ev_set_priority (&sigev, EV_MAXPRI);
754 } 812 }
755} 813}
756 814
757void 815void
758loop_destroy (EV_P) 816loop_destroy (EV_P)
759{ 817{
760 int i; 818 int i;
761 819
762#if EV_USE_WIN32 820#if EV_USE_PORT
763 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 821 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
764#endif 822#endif
765#if EV_USE_KQUEUE 823#if EV_USE_KQUEUE
766 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 824 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
767#endif 825#endif
768#if EV_USE_EPOLL 826#if EV_USE_EPOLL
… …
777 835
778 for (i = NUMPRI; i--; ) 836 for (i = NUMPRI; i--; )
779 array_free (pending, [i]); 837 array_free (pending, [i]);
780 838
781 /* have to use the microsoft-never-gets-it-right macro */ 839 /* have to use the microsoft-never-gets-it-right macro */
782 array_free_microshit (fdchange); 840 array_free (fdchange, EMPTY0);
783 array_free_microshit (timer); 841 array_free (timer, EMPTY0);
784 array_free_microshit (periodic); 842#if EV_PERIODICS
785 array_free_microshit (idle); 843 array_free (periodic, EMPTY0);
786 array_free_microshit (prepare); 844#endif
787 array_free_microshit (check); 845 array_free (idle, EMPTY0);
846 array_free (prepare, EMPTY0);
847 array_free (check, EMPTY0);
788 848
789 method = 0; 849 method = 0;
790} 850}
791 851
792static void 852static void
793loop_fork (EV_P) 853loop_fork (EV_P)
794{ 854{
855#if EV_USE_PORT
856 if (method == EVMETHOD_PORT ) port_fork (EV_A);
857#endif
858#if EV_USE_KQUEUE
859 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
860#endif
795#if EV_USE_EPOLL 861#if EV_USE_EPOLL
796 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 862 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
797#endif
798#if EV_USE_KQUEUE
799 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
800#endif 863#endif
801 864
802 if (ev_is_active (&sigev)) 865 if (ev_is_active (&sigev))
803 { 866 {
804 /* default loop */ 867 /* default loop */
… …
817 postfork = 0; 880 postfork = 0;
818} 881}
819 882
820#if EV_MULTIPLICITY 883#if EV_MULTIPLICITY
821struct ev_loop * 884struct ev_loop *
822ev_loop_new (int methods) 885ev_loop_new (unsigned int flags)
823{ 886{
824 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 887 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
825 888
826 memset (loop, 0, sizeof (struct ev_loop)); 889 memset (loop, 0, sizeof (struct ev_loop));
827 890
828 loop_init (EV_A_ methods); 891 loop_init (EV_A_ flags);
829 892
830 if (ev_method (EV_A)) 893 if (ev_method (EV_A))
831 return loop; 894 return loop;
832 895
833 return 0; 896 return 0;
… …
848 911
849#endif 912#endif
850 913
851#if EV_MULTIPLICITY 914#if EV_MULTIPLICITY
852struct ev_loop * 915struct ev_loop *
916ev_default_loop_ (unsigned int flags)
853#else 917#else
854int 918int
919ev_default_loop (unsigned int flags)
855#endif 920#endif
856ev_default_loop (int methods)
857{ 921{
858 if (sigpipe [0] == sigpipe [1]) 922 if (sigpipe [0] == sigpipe [1])
859 if (pipe (sigpipe)) 923 if (pipe (sigpipe))
860 return 0; 924 return 0;
861 925
862 if (!default_loop) 926 if (!ev_default_loop_ptr)
863 { 927 {
864#if EV_MULTIPLICITY 928#if EV_MULTIPLICITY
865 struct ev_loop *loop = default_loop = &default_loop_struct; 929 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
866#else 930#else
867 default_loop = 1; 931 ev_default_loop_ptr = 1;
868#endif 932#endif
869 933
870 loop_init (EV_A_ methods); 934 loop_init (EV_A_ flags);
871 935
872 if (ev_method (EV_A)) 936 if (ev_method (EV_A))
873 { 937 {
874 siginit (EV_A); 938 siginit (EV_A);
875 939
876#ifndef WIN32 940#ifndef _WIN32
877 ev_signal_init (&childev, childcb, SIGCHLD); 941 ev_signal_init (&childev, childcb, SIGCHLD);
878 ev_set_priority (&childev, EV_MAXPRI); 942 ev_set_priority (&childev, EV_MAXPRI);
879 ev_signal_start (EV_A_ &childev); 943 ev_signal_start (EV_A_ &childev);
880 ev_unref (EV_A); /* child watcher should not keep loop alive */ 944 ev_unref (EV_A); /* child watcher should not keep loop alive */
881#endif 945#endif
882 } 946 }
883 else 947 else
884 default_loop = 0; 948 ev_default_loop_ptr = 0;
885 } 949 }
886 950
887 return default_loop; 951 return ev_default_loop_ptr;
888} 952}
889 953
890void 954void
891ev_default_destroy (void) 955ev_default_destroy (void)
892{ 956{
893#if EV_MULTIPLICITY 957#if EV_MULTIPLICITY
894 struct ev_loop *loop = default_loop; 958 struct ev_loop *loop = ev_default_loop_ptr;
895#endif 959#endif
896 960
897#ifndef WIN32 961#ifndef _WIN32
898 ev_ref (EV_A); /* child watcher */ 962 ev_ref (EV_A); /* child watcher */
899 ev_signal_stop (EV_A_ &childev); 963 ev_signal_stop (EV_A_ &childev);
900#endif 964#endif
901 965
902 ev_ref (EV_A); /* signal watcher */ 966 ev_ref (EV_A); /* signal watcher */
… …
910 974
911void 975void
912ev_default_fork (void) 976ev_default_fork (void)
913{ 977{
914#if EV_MULTIPLICITY 978#if EV_MULTIPLICITY
915 struct ev_loop *loop = default_loop; 979 struct ev_loop *loop = ev_default_loop_ptr;
916#endif 980#endif
917 981
918 if (method) 982 if (method)
919 postfork = 1; 983 postfork = 1;
920} 984}
… …
944 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1008 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
945 1009
946 if (p->w) 1010 if (p->w)
947 { 1011 {
948 p->w->pending = 0; 1012 p->w->pending = 0;
949 p->w->cb (EV_A_ p->w, p->events); 1013 EV_CB_INVOKE (p->w, p->events);
950 } 1014 }
951 } 1015 }
952} 1016}
953 1017
954static void 1018static void
… …
962 1026
963 /* first reschedule or stop timer */ 1027 /* first reschedule or stop timer */
964 if (w->repeat) 1028 if (w->repeat)
965 { 1029 {
966 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1030 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1031
967 ((WT)w)->at = mn_now + w->repeat; 1032 ((WT)w)->at += w->repeat;
1033 if (((WT)w)->at < mn_now)
1034 ((WT)w)->at = mn_now;
1035
968 downheap ((WT *)timers, timercnt, 0); 1036 downheap ((WT *)timers, timercnt, 0);
969 } 1037 }
970 else 1038 else
971 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1039 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
972 1040
973 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1041 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
974 } 1042 }
975} 1043}
976 1044
1045#if EV_PERIODICS
977static void 1046static void
978periodics_reify (EV_P) 1047periodics_reify (EV_P)
979{ 1048{
980 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1049 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
981 { 1050 {
982 struct ev_periodic *w = periodics [0]; 1051 struct ev_periodic *w = periodics [0];
983 1052
984 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1053 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
985 1054
986 /* first reschedule or stop timer */ 1055 /* first reschedule or stop timer */
987 if (w->reschedule_cb) 1056 if (w->reschedule_cb)
988 { 1057 {
989 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1058 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
990
991 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1059 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
992 downheap ((WT *)periodics, periodiccnt, 0); 1060 downheap ((WT *)periodics, periodiccnt, 0);
993 } 1061 }
994 else if (w->interval) 1062 else if (w->interval)
995 { 1063 {
996 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1064 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
997 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1065 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
998 downheap ((WT *)periodics, periodiccnt, 0); 1066 downheap ((WT *)periodics, periodiccnt, 0);
999 } 1067 }
1000 else 1068 else
1001 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1069 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1002 1070
… …
1013 for (i = 0; i < periodiccnt; ++i) 1081 for (i = 0; i < periodiccnt; ++i)
1014 { 1082 {
1015 struct ev_periodic *w = periodics [i]; 1083 struct ev_periodic *w = periodics [i];
1016 1084
1017 if (w->reschedule_cb) 1085 if (w->reschedule_cb)
1018 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1086 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1019 else if (w->interval) 1087 else if (w->interval)
1020 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1088 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1021 } 1089 }
1022 1090
1023 /* now rebuild the heap */ 1091 /* now rebuild the heap */
1024 for (i = periodiccnt >> 1; i--; ) 1092 for (i = periodiccnt >> 1; i--; )
1025 downheap ((WT *)periodics, periodiccnt, i); 1093 downheap ((WT *)periodics, periodiccnt, i);
1026} 1094}
1095#endif
1027 1096
1028inline int 1097inline int
1029time_update_monotonic (EV_P) 1098time_update_monotonic (EV_P)
1030{ 1099{
1031 mn_now = get_clock (); 1100 mn_now = get_clock ();
1032 1101
1033 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1102 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1034 { 1103 {
1035 rt_now = rtmn_diff + mn_now; 1104 ev_rt_now = rtmn_diff + mn_now;
1036 return 0; 1105 return 0;
1037 } 1106 }
1038 else 1107 else
1039 { 1108 {
1040 now_floor = mn_now; 1109 now_floor = mn_now;
1041 rt_now = ev_time (); 1110 ev_rt_now = ev_time ();
1042 return 1; 1111 return 1;
1043 } 1112 }
1044} 1113}
1045 1114
1046static void 1115static void
… …
1055 { 1124 {
1056 ev_tstamp odiff = rtmn_diff; 1125 ev_tstamp odiff = rtmn_diff;
1057 1126
1058 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1127 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1059 { 1128 {
1060 rtmn_diff = rt_now - mn_now; 1129 rtmn_diff = ev_rt_now - mn_now;
1061 1130
1062 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1131 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1063 return; /* all is well */ 1132 return; /* all is well */
1064 1133
1065 rt_now = ev_time (); 1134 ev_rt_now = ev_time ();
1066 mn_now = get_clock (); 1135 mn_now = get_clock ();
1067 now_floor = mn_now; 1136 now_floor = mn_now;
1068 } 1137 }
1069 1138
1139# if EV_PERIODICS
1070 periodics_reschedule (EV_A); 1140 periodics_reschedule (EV_A);
1141# endif
1071 /* no timer adjustment, as the monotonic clock doesn't jump */ 1142 /* no timer adjustment, as the monotonic clock doesn't jump */
1072 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1143 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1073 } 1144 }
1074 } 1145 }
1075 else 1146 else
1076#endif 1147#endif
1077 { 1148 {
1078 rt_now = ev_time (); 1149 ev_rt_now = ev_time ();
1079 1150
1080 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1151 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1081 { 1152 {
1153#if EV_PERIODICS
1082 periodics_reschedule (EV_A); 1154 periodics_reschedule (EV_A);
1155#endif
1083 1156
1084 /* adjust timers. this is easy, as the offset is the same for all */ 1157 /* adjust timers. this is easy, as the offset is the same for all */
1085 for (i = 0; i < timercnt; ++i) 1158 for (i = 0; i < timercnt; ++i)
1086 ((WT)timers [i])->at += rt_now - mn_now; 1159 ((WT)timers [i])->at += ev_rt_now - mn_now;
1087 } 1160 }
1088 1161
1089 mn_now = rt_now; 1162 mn_now = ev_rt_now;
1090 } 1163 }
1091} 1164}
1092 1165
1093void 1166void
1094ev_ref (EV_P) 1167ev_ref (EV_P)
… …
1108ev_loop (EV_P_ int flags) 1181ev_loop (EV_P_ int flags)
1109{ 1182{
1110 double block; 1183 double block;
1111 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1184 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1112 1185
1113 do 1186 while (activecnt)
1114 { 1187 {
1115 /* queue check watchers (and execute them) */ 1188 /* queue check watchers (and execute them) */
1116 if (expect_false (preparecnt)) 1189 if (expect_false (preparecnt))
1117 { 1190 {
1118 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1191 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1134 if (expect_true (have_monotonic)) 1207 if (expect_true (have_monotonic))
1135 time_update_monotonic (EV_A); 1208 time_update_monotonic (EV_A);
1136 else 1209 else
1137#endif 1210#endif
1138 { 1211 {
1139 rt_now = ev_time (); 1212 ev_rt_now = ev_time ();
1140 mn_now = rt_now; 1213 mn_now = ev_rt_now;
1141 } 1214 }
1142 1215
1143 if (flags & EVLOOP_NONBLOCK || idlecnt) 1216 if (flags & EVLOOP_NONBLOCK || idlecnt)
1144 block = 0.; 1217 block = 0.;
1145 else 1218 else
… …
1150 { 1223 {
1151 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1224 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1152 if (block > to) block = to; 1225 if (block > to) block = to;
1153 } 1226 }
1154 1227
1228#if EV_PERIODICS
1155 if (periodiccnt) 1229 if (periodiccnt)
1156 { 1230 {
1157 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1231 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1158 if (block > to) block = to; 1232 if (block > to) block = to;
1159 } 1233 }
1234#endif
1160 1235
1161 if (block < 0.) block = 0.; 1236 if (block < 0.) block = 0.;
1162 } 1237 }
1163 1238
1164 method_poll (EV_A_ block); 1239 method_poll (EV_A_ block);
1165 1240
1166 /* update rt_now, do magic */ 1241 /* update ev_rt_now, do magic */
1167 time_update (EV_A); 1242 time_update (EV_A);
1168 1243
1169 /* queue pending timers and reschedule them */ 1244 /* queue pending timers and reschedule them */
1170 timers_reify (EV_A); /* relative timers called last */ 1245 timers_reify (EV_A); /* relative timers called last */
1246#if EV_PERIODICS
1171 periodics_reify (EV_A); /* absolute timers called first */ 1247 periodics_reify (EV_A); /* absolute timers called first */
1248#endif
1172 1249
1173 /* queue idle watchers unless io or timers are pending */ 1250 /* queue idle watchers unless io or timers are pending */
1174 if (idlecnt && !any_pending (EV_A)) 1251 if (idlecnt && !any_pending (EV_A))
1175 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1252 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1176 1253
1177 /* queue check watchers, to be executed first */ 1254 /* queue check watchers, to be executed first */
1178 if (checkcnt) 1255 if (checkcnt)
1179 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1256 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1180 1257
1181 call_pending (EV_A); 1258 call_pending (EV_A);
1259
1260 if (loop_done)
1261 break;
1182 } 1262 }
1183 while (activecnt && !loop_done);
1184 1263
1185 if (loop_done != 2) 1264 if (loop_done != 2)
1186 loop_done = 0; 1265 loop_done = 0;
1187} 1266}
1188 1267
… …
1267{ 1346{
1268 ev_clear_pending (EV_A_ (W)w); 1347 ev_clear_pending (EV_A_ (W)w);
1269 if (!ev_is_active (w)) 1348 if (!ev_is_active (w))
1270 return; 1349 return;
1271 1350
1351 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1352
1272 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1353 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1273 ev_stop (EV_A_ (W)w); 1354 ev_stop (EV_A_ (W)w);
1274 1355
1275 fd_change (EV_A_ w->fd); 1356 fd_change (EV_A_ w->fd);
1276} 1357}
… …
1284 ((WT)w)->at += mn_now; 1365 ((WT)w)->at += mn_now;
1285 1366
1286 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1367 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1287 1368
1288 ev_start (EV_A_ (W)w, ++timercnt); 1369 ev_start (EV_A_ (W)w, ++timercnt);
1289 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1370 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1290 timers [timercnt - 1] = w; 1371 timers [timercnt - 1] = w;
1291 upheap ((WT *)timers, timercnt - 1); 1372 upheap ((WT *)timers, timercnt - 1);
1292 1373
1293 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1374 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1294} 1375}
… …
1303 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1384 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1304 1385
1305 if (((W)w)->active < timercnt--) 1386 if (((W)w)->active < timercnt--)
1306 { 1387 {
1307 timers [((W)w)->active - 1] = timers [timercnt]; 1388 timers [((W)w)->active - 1] = timers [timercnt];
1308 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1389 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1309 } 1390 }
1310 1391
1311 ((WT)w)->at = w->repeat; 1392 ((WT)w)->at -= mn_now;
1312 1393
1313 ev_stop (EV_A_ (W)w); 1394 ev_stop (EV_A_ (W)w);
1314} 1395}
1315 1396
1316void 1397void
… …
1319 if (ev_is_active (w)) 1400 if (ev_is_active (w))
1320 { 1401 {
1321 if (w->repeat) 1402 if (w->repeat)
1322 { 1403 {
1323 ((WT)w)->at = mn_now + w->repeat; 1404 ((WT)w)->at = mn_now + w->repeat;
1324 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1405 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1325 } 1406 }
1326 else 1407 else
1327 ev_timer_stop (EV_A_ w); 1408 ev_timer_stop (EV_A_ w);
1328 } 1409 }
1329 else if (w->repeat) 1410 else if (w->repeat)
1411 {
1412 w->at = w->repeat;
1330 ev_timer_start (EV_A_ w); 1413 ev_timer_start (EV_A_ w);
1414 }
1331} 1415}
1332 1416
1417#if EV_PERIODICS
1333void 1418void
1334ev_periodic_start (EV_P_ struct ev_periodic *w) 1419ev_periodic_start (EV_P_ struct ev_periodic *w)
1335{ 1420{
1336 if (ev_is_active (w)) 1421 if (ev_is_active (w))
1337 return; 1422 return;
1338 1423
1339 if (w->reschedule_cb) 1424 if (w->reschedule_cb)
1340 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1425 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1341 else if (w->interval) 1426 else if (w->interval)
1342 { 1427 {
1343 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1428 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1344 /* this formula differs from the one in periodic_reify because we do not always round up */ 1429 /* this formula differs from the one in periodic_reify because we do not always round up */
1345 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1430 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1346 } 1431 }
1347 1432
1348 ev_start (EV_A_ (W)w, ++periodiccnt); 1433 ev_start (EV_A_ (W)w, ++periodiccnt);
1349 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1434 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1350 periodics [periodiccnt - 1] = w; 1435 periodics [periodiccnt - 1] = w;
1351 upheap ((WT *)periodics, periodiccnt - 1); 1436 upheap ((WT *)periodics, periodiccnt - 1);
1352 1437
1353 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1438 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1354} 1439}
… …
1363 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1448 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1364 1449
1365 if (((W)w)->active < periodiccnt--) 1450 if (((W)w)->active < periodiccnt--)
1366 { 1451 {
1367 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1452 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1368 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1453 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1369 } 1454 }
1370 1455
1371 ev_stop (EV_A_ (W)w); 1456 ev_stop (EV_A_ (W)w);
1372} 1457}
1373 1458
1374void 1459void
1375ev_periodic_again (EV_P_ struct ev_periodic *w) 1460ev_periodic_again (EV_P_ struct ev_periodic *w)
1376{ 1461{
1462 /* TODO: use adjustheap and recalculation */
1377 ev_periodic_stop (EV_A_ w); 1463 ev_periodic_stop (EV_A_ w);
1378 ev_periodic_start (EV_A_ w); 1464 ev_periodic_start (EV_A_ w);
1379} 1465}
1466#endif
1380 1467
1381void 1468void
1382ev_idle_start (EV_P_ struct ev_idle *w) 1469ev_idle_start (EV_P_ struct ev_idle *w)
1383{ 1470{
1384 if (ev_is_active (w)) 1471 if (ev_is_active (w))
1385 return; 1472 return;
1386 1473
1387 ev_start (EV_A_ (W)w, ++idlecnt); 1474 ev_start (EV_A_ (W)w, ++idlecnt);
1388 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1475 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1389 idles [idlecnt - 1] = w; 1476 idles [idlecnt - 1] = w;
1390} 1477}
1391 1478
1392void 1479void
1393ev_idle_stop (EV_P_ struct ev_idle *w) 1480ev_idle_stop (EV_P_ struct ev_idle *w)
1394{ 1481{
1395 ev_clear_pending (EV_A_ (W)w); 1482 ev_clear_pending (EV_A_ (W)w);
1396 if (ev_is_active (w)) 1483 if (!ev_is_active (w))
1397 return; 1484 return;
1398 1485
1399 idles [((W)w)->active - 1] = idles [--idlecnt]; 1486 idles [((W)w)->active - 1] = idles [--idlecnt];
1400 ev_stop (EV_A_ (W)w); 1487 ev_stop (EV_A_ (W)w);
1401} 1488}
… …
1405{ 1492{
1406 if (ev_is_active (w)) 1493 if (ev_is_active (w))
1407 return; 1494 return;
1408 1495
1409 ev_start (EV_A_ (W)w, ++preparecnt); 1496 ev_start (EV_A_ (W)w, ++preparecnt);
1410 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1497 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1411 prepares [preparecnt - 1] = w; 1498 prepares [preparecnt - 1] = w;
1412} 1499}
1413 1500
1414void 1501void
1415ev_prepare_stop (EV_P_ struct ev_prepare *w) 1502ev_prepare_stop (EV_P_ struct ev_prepare *w)
1416{ 1503{
1417 ev_clear_pending (EV_A_ (W)w); 1504 ev_clear_pending (EV_A_ (W)w);
1418 if (ev_is_active (w)) 1505 if (!ev_is_active (w))
1419 return; 1506 return;
1420 1507
1421 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1508 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1422 ev_stop (EV_A_ (W)w); 1509 ev_stop (EV_A_ (W)w);
1423} 1510}
… …
1427{ 1514{
1428 if (ev_is_active (w)) 1515 if (ev_is_active (w))
1429 return; 1516 return;
1430 1517
1431 ev_start (EV_A_ (W)w, ++checkcnt); 1518 ev_start (EV_A_ (W)w, ++checkcnt);
1432 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1519 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1433 checks [checkcnt - 1] = w; 1520 checks [checkcnt - 1] = w;
1434} 1521}
1435 1522
1436void 1523void
1437ev_check_stop (EV_P_ struct ev_check *w) 1524ev_check_stop (EV_P_ struct ev_check *w)
1438{ 1525{
1439 ev_clear_pending (EV_A_ (W)w); 1526 ev_clear_pending (EV_A_ (W)w);
1440 if (ev_is_active (w)) 1527 if (!ev_is_active (w))
1441 return; 1528 return;
1442 1529
1443 checks [((W)w)->active - 1] = checks [--checkcnt]; 1530 checks [((W)w)->active - 1] = checks [--checkcnt];
1444 ev_stop (EV_A_ (W)w); 1531 ev_stop (EV_A_ (W)w);
1445} 1532}
… …
1450 1537
1451void 1538void
1452ev_signal_start (EV_P_ struct ev_signal *w) 1539ev_signal_start (EV_P_ struct ev_signal *w)
1453{ 1540{
1454#if EV_MULTIPLICITY 1541#if EV_MULTIPLICITY
1455 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1542 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1456#endif 1543#endif
1457 if (ev_is_active (w)) 1544 if (ev_is_active (w))
1458 return; 1545 return;
1459 1546
1460 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1547 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
… …
1463 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1550 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1464 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1551 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1465 1552
1466 if (!((WL)w)->next) 1553 if (!((WL)w)->next)
1467 { 1554 {
1468#if WIN32 1555#if _WIN32
1469 signal (w->signum, sighandler); 1556 signal (w->signum, sighandler);
1470#else 1557#else
1471 struct sigaction sa; 1558 struct sigaction sa;
1472 sa.sa_handler = sighandler; 1559 sa.sa_handler = sighandler;
1473 sigfillset (&sa.sa_mask); 1560 sigfillset (&sa.sa_mask);
… …
1493 1580
1494void 1581void
1495ev_child_start (EV_P_ struct ev_child *w) 1582ev_child_start (EV_P_ struct ev_child *w)
1496{ 1583{
1497#if EV_MULTIPLICITY 1584#if EV_MULTIPLICITY
1498 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1585 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1499#endif 1586#endif
1500 if (ev_is_active (w)) 1587 if (ev_is_active (w))
1501 return; 1588 return;
1502 1589
1503 ev_start (EV_A_ (W)w, 1); 1590 ev_start (EV_A_ (W)w, 1);
… …
1506 1593
1507void 1594void
1508ev_child_stop (EV_P_ struct ev_child *w) 1595ev_child_stop (EV_P_ struct ev_child *w)
1509{ 1596{
1510 ev_clear_pending (EV_A_ (W)w); 1597 ev_clear_pending (EV_A_ (W)w);
1511 if (ev_is_active (w)) 1598 if (!ev_is_active (w))
1512 return; 1599 return;
1513 1600
1514 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1601 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1515 ev_stop (EV_A_ (W)w); 1602 ev_stop (EV_A_ (W)w);
1516} 1603}
… …
1560 else 1647 else
1561 { 1648 {
1562 once->cb = cb; 1649 once->cb = cb;
1563 once->arg = arg; 1650 once->arg = arg;
1564 1651
1565 ev_watcher_init (&once->io, once_cb_io); 1652 ev_init (&once->io, once_cb_io);
1566 if (fd >= 0) 1653 if (fd >= 0)
1567 { 1654 {
1568 ev_io_set (&once->io, fd, events); 1655 ev_io_set (&once->io, fd, events);
1569 ev_io_start (EV_A_ &once->io); 1656 ev_io_start (EV_A_ &once->io);
1570 } 1657 }
1571 1658
1572 ev_watcher_init (&once->to, once_cb_to); 1659 ev_init (&once->to, once_cb_to);
1573 if (timeout >= 0.) 1660 if (timeout >= 0.)
1574 { 1661 {
1575 ev_timer_set (&once->to, timeout, 0.); 1662 ev_timer_set (&once->to, timeout, 0.);
1576 ev_timer_start (EV_A_ &once->to); 1663 ev_timer_start (EV_A_ &once->to);
1577 } 1664 }
1578 } 1665 }
1579} 1666}
1580 1667
1668#ifdef __cplusplus
1669}
1670#endif
1671

Diff Legend

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