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.119 by root, Fri Nov 16 01:43:52 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_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;
215 int events; 256 int events;
216} ANPENDING; 257} ANPENDING;
217 258
218#if EV_MULTIPLICITY 259#if EV_MULTIPLICITY
219 260
220struct 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};
225# undef VAR 267 #undef VAR
268 };
226# include "ev_wrap.h" 269 #include "ev_wrap.h"
270
271 static struct ev_loop default_loop_struct;
272 struct ev_loop *ev_default_loop_ptr;
227 273
228#else 274#else
229 275
276 ev_tstamp ev_rt_now;
230# define VAR(name,decl) static decl; 277 #define VAR(name,decl) static decl;
231# include "ev_vars.h" 278 #include "ev_vars.h"
232# undef VAR 279 #undef VAR
280
281 static int ev_default_loop_ptr;
233 282
234#endif 283#endif
235 284
236/*****************************************************************************/ 285/*****************************************************************************/
237 286
238inline ev_tstamp 287ev_tstamp
239ev_time (void) 288ev_time (void)
240{ 289{
241#if EV_USE_REALTIME 290#if EV_USE_REALTIME
242 struct timespec ts; 291 struct timespec ts;
243 clock_gettime (CLOCK_REALTIME, &ts); 292 clock_gettime (CLOCK_REALTIME, &ts);
262#endif 311#endif
263 312
264 return ev_time (); 313 return ev_time ();
265} 314}
266 315
316#if EV_MULTIPLICITY
267ev_tstamp 317ev_tstamp
268ev_now (EV_P) 318ev_now (EV_P)
269{ 319{
270 return rt_now; 320 return ev_rt_now;
271} 321}
322#endif
272 323
273#define array_roundsize(type,n) ((n) | 4 & ~3) 324#define array_roundsize(type,n) (((n) | 4) & ~3)
274 325
275#define array_needsize(type,base,cur,cnt,init) \ 326#define array_needsize(type,base,cur,cnt,init) \
276 if (expect_false ((cnt) > cur)) \ 327 if (expect_false ((cnt) > cur)) \
277 { \ 328 { \
278 int newcnt = cur; \ 329 int newcnt = cur; \
293 stem ## max = array_roundsize (stem ## cnt >> 1); \ 344 stem ## max = array_roundsize (stem ## cnt >> 1); \
294 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 345 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
295 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 346 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
296 } 347 }
297 348
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) \ 349#define array_free(stem, idx) \
304 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;
305 351
306/*****************************************************************************/ 352/*****************************************************************************/
307 353
328 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 374 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
329 return; 375 return;
330 } 376 }
331 377
332 w_->pending = ++pendingcnt [ABSPRI (w_)]; 378 w_->pending = ++pendingcnt [ABSPRI (w_)];
333 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);
334 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 380 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
335 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 381 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
336} 382}
337 383
338static void 384static void
342 388
343 for (i = 0; i < eventcnt; ++i) 389 for (i = 0; i < eventcnt; ++i)
344 ev_feed_event (EV_A_ events [i], type); 390 ev_feed_event (EV_A_ events [i], type);
345} 391}
346 392
347static void 393inline void
348fd_event (EV_P_ int fd, int events) 394fd_event (EV_P_ int fd, int revents)
349{ 395{
350 ANFD *anfd = anfds + fd; 396 ANFD *anfd = anfds + fd;
351 struct ev_io *w; 397 struct ev_io *w;
352 398
353 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 399 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
354 { 400 {
355 int ev = w->events & events; 401 int ev = w->events & revents;
356 402
357 if (ev) 403 if (ev)
358 ev_feed_event (EV_A_ (W)w, ev); 404 ev_feed_event (EV_A_ (W)w, ev);
359 } 405 }
406}
407
408void
409ev_feed_fd_event (EV_P_ int fd, int revents)
410{
411 fd_event (EV_A_ fd, revents);
360} 412}
361 413
362/*****************************************************************************/ 414/*****************************************************************************/
363 415
364static void 416static void
375 int events = 0; 427 int events = 0;
376 428
377 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)
378 events |= w->events; 430 events |= w->events;
379 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
380 anfd->reify = 0; 441 anfd->reify = 0;
381 442
382 method_modify (EV_A_ fd, anfd->events, events); 443 method_modify (EV_A_ fd, anfd->events, events);
383 anfd->events = events; 444 anfd->events = events;
384 } 445 }
393 return; 454 return;
394 455
395 anfds [fd].reify = 1; 456 anfds [fd].reify = 1;
396 457
397 ++fdchangecnt; 458 ++fdchangecnt;
398 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 459 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
399 fdchanges [fdchangecnt - 1] = fd; 460 fdchanges [fdchangecnt - 1] = fd;
400} 461}
401 462
402static void 463static void
403fd_kill (EV_P_ int fd) 464fd_kill (EV_P_ int fd)
412} 473}
413 474
414static int 475static int
415fd_valid (int fd) 476fd_valid (int fd)
416{ 477{
417#ifdef WIN32 478#ifdef _WIN32
418 return !!win32_get_osfhandle (fd); 479 return _get_osfhandle (fd) != -1;
419#else 480#else
420 return fcntl (fd, F_GETFD) != -1; 481 return fcntl (fd, F_GETFD) != -1;
421#endif 482#endif
422} 483}
423 484
503 564
504 heap [k] = w; 565 heap [k] = w;
505 ((W)heap [k])->active = k + 1; 566 ((W)heap [k])->active = k + 1;
506} 567}
507 568
569inline void
570adjustheap (WT *heap, int N, int k)
571{
572 upheap (heap, k);
573 downheap (heap, N, k);
574}
575
508/*****************************************************************************/ 576/*****************************************************************************/
509 577
510typedef struct 578typedef struct
511{ 579{
512 WL head; 580 WL head;
533} 601}
534 602
535static void 603static void
536sighandler (int signum) 604sighandler (int signum)
537{ 605{
538#if WIN32 606#if _WIN32
539 signal (signum, sighandler); 607 signal (signum, sighandler);
540#endif 608#endif
541 609
542 signals [signum - 1].gotsig = 1; 610 signals [signum - 1].gotsig = 1;
543 611
544 if (!gotsig) 612 if (!gotsig)
545 { 613 {
546 int old_errno = errno; 614 int old_errno = errno;
547 gotsig = 1; 615 gotsig = 1;
548#ifdef WIN32
549 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
550#else
551 write (sigpipe [1], &signum, 1); 616 write (sigpipe [1], &signum, 1);
552#endif
553 errno = old_errno; 617 errno = old_errno;
554 } 618 }
555} 619}
556 620
621void
622ev_feed_signal_event (EV_P_ int signum)
623{
624 WL w;
625
626#if EV_MULTIPLICITY
627 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
628#endif
629
630 --signum;
631
632 if (signum < 0 || signum >= signalmax)
633 return;
634
635 signals [signum].gotsig = 0;
636
637 for (w = signals [signum].head; w; w = w->next)
638 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
639}
640
557static void 641static void
558sigcb (EV_P_ struct ev_io *iow, int revents) 642sigcb (EV_P_ struct ev_io *iow, int revents)
559{ 643{
560 WL w;
561 int signum; 644 int signum;
562 645
563#ifdef WIN32
564 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
565#else
566 read (sigpipe [0], &revents, 1); 646 read (sigpipe [0], &revents, 1);
567#endif
568 gotsig = 0; 647 gotsig = 0;
569 648
570 for (signum = signalmax; signum--; ) 649 for (signum = signalmax; signum--; )
571 if (signals [signum].gotsig) 650 if (signals [signum].gotsig)
572 { 651 ev_feed_signal_event (EV_A_ signum + 1);
573 signals [signum].gotsig = 0; 652}
574 653
575 for (w = signals [signum].head; w; w = w->next) 654inline void
576 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 655fd_intern (int fd)
577 } 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
578} 664}
579 665
580static void 666static void
581siginit (EV_P) 667siginit (EV_P)
582{ 668{
583#ifndef WIN32 669 fd_intern (sigpipe [0]);
584 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 670 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 671
592 ev_io_set (&sigev, sigpipe [0], EV_READ); 672 ev_io_set (&sigev, sigpipe [0], EV_READ);
593 ev_io_start (EV_A_ &sigev); 673 ev_io_start (EV_A_ &sigev);
594 ev_unref (EV_A); /* child watcher should not keep loop alive */ 674 ev_unref (EV_A); /* child watcher should not keep loop alive */
595} 675}
596 676
597/*****************************************************************************/ 677/*****************************************************************************/
598 678
599static struct ev_child *childs [PID_HASHSIZE]; 679static struct ev_child *childs [PID_HASHSIZE];
600 680
601#ifndef WIN32 681#ifndef _WIN32
602 682
603static struct ev_signal childev; 683static struct ev_signal childev;
604 684
605#ifndef WCONTINUED 685#ifndef WCONTINUED
606# define WCONTINUED 0 686# define WCONTINUED 0
638 718
639#endif 719#endif
640 720
641/*****************************************************************************/ 721/*****************************************************************************/
642 722
723#if EV_USE_PORT
724# include "ev_port.c"
725#endif
643#if EV_USE_KQUEUE 726#if EV_USE_KQUEUE
644# include "ev_kqueue.c" 727# include "ev_kqueue.c"
645#endif 728#endif
646#if EV_USE_EPOLL 729#if EV_USE_EPOLL
647# include "ev_epoll.c" 730# include "ev_epoll.c"
667 750
668/* 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 */
669static int 752static int
670enable_secure (void) 753enable_secure (void)
671{ 754{
672#ifdef WIN32 755#ifdef _WIN32
673 return 0; 756 return 0;
674#else 757#else
675 return getuid () != geteuid () 758 return getuid () != geteuid ()
676 || getgid () != getegid (); 759 || getgid () != getegid ();
677#endif 760#endif
678} 761}
679 762
680int 763unsigned int
681ev_method (EV_P) 764ev_method (EV_P)
682{ 765{
683 return method; 766 return method;
684} 767}
685 768
686static void 769static void
687loop_init (EV_P_ int methods) 770loop_init (EV_P_ unsigned int flags)
688{ 771{
689 if (!method) 772 if (!method)
690 { 773 {
691#if EV_USE_MONOTONIC 774#if EV_USE_MONOTONIC
692 { 775 {
694 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 777 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
695 have_monotonic = 1; 778 have_monotonic = 1;
696 } 779 }
697#endif 780#endif
698 781
699 rt_now = ev_time (); 782 ev_rt_now = ev_time ();
700 mn_now = get_clock (); 783 mn_now = get_clock ();
701 now_floor = mn_now; 784 now_floor = mn_now;
702 rtmn_diff = rt_now - mn_now; 785 rtmn_diff = ev_rt_now - mn_now;
703 786
704 if (methods == EVMETHOD_AUTO) 787 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
705 if (!enable_secure () && getenv ("LIBEV_METHODS"))
706 methods = atoi (getenv ("LIBEV_METHODS")); 788 flags = atoi (getenv ("LIBEV_FLAGS"));
707 else 789
708 methods = EVMETHOD_ANY; 790 if (!(flags & 0x0000ffff))
791 flags |= 0x0000ffff;
709 792
710 method = 0; 793 method = 0;
711#if EV_USE_WIN32 794#if EV_USE_PORT
712 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 795 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
713#endif 796#endif
714#if EV_USE_KQUEUE 797#if EV_USE_KQUEUE
715 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 798 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
716#endif 799#endif
717#if EV_USE_EPOLL 800#if EV_USE_EPOLL
718 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 801 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
719#endif 802#endif
720#if EV_USE_POLL 803#if EV_USE_POLL
721 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 804 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
722#endif 805#endif
723#if EV_USE_SELECT 806#if EV_USE_SELECT
724 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 807 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
725#endif 808#endif
726 809
727 ev_watcher_init (&sigev, sigcb); 810 ev_init (&sigev, sigcb);
728 ev_set_priority (&sigev, EV_MAXPRI); 811 ev_set_priority (&sigev, EV_MAXPRI);
729 } 812 }
730} 813}
731 814
732void 815void
733loop_destroy (EV_P) 816loop_destroy (EV_P)
734{ 817{
735 int i; 818 int i;
736 819
737#if EV_USE_WIN32 820#if EV_USE_PORT
738 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 821 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
739#endif 822#endif
740#if EV_USE_KQUEUE 823#if EV_USE_KQUEUE
741 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 824 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
742#endif 825#endif
743#if EV_USE_EPOLL 826#if EV_USE_EPOLL
752 835
753 for (i = NUMPRI; i--; ) 836 for (i = NUMPRI; i--; )
754 array_free (pending, [i]); 837 array_free (pending, [i]);
755 838
756 /* have to use the microsoft-never-gets-it-right macro */ 839 /* have to use the microsoft-never-gets-it-right macro */
757 array_free_microshit (fdchange); 840 array_free (fdchange, EMPTY0);
758 array_free_microshit (timer); 841 array_free (timer, EMPTY0);
759 array_free_microshit (periodic); 842#if EV_PERIODICS
760 array_free_microshit (idle); 843 array_free (periodic, EMPTY0);
761 array_free_microshit (prepare); 844#endif
762 array_free_microshit (check); 845 array_free (idle, EMPTY0);
846 array_free (prepare, EMPTY0);
847 array_free (check, EMPTY0);
763 848
764 method = 0; 849 method = 0;
765} 850}
766 851
767static void 852static void
768loop_fork (EV_P) 853loop_fork (EV_P)
769{ 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
770#if EV_USE_EPOLL 861#if EV_USE_EPOLL
771 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 862 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
772#endif
773#if EV_USE_KQUEUE
774 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
775#endif 863#endif
776 864
777 if (ev_is_active (&sigev)) 865 if (ev_is_active (&sigev))
778 { 866 {
779 /* default loop */ 867 /* default loop */
792 postfork = 0; 880 postfork = 0;
793} 881}
794 882
795#if EV_MULTIPLICITY 883#if EV_MULTIPLICITY
796struct ev_loop * 884struct ev_loop *
797ev_loop_new (int methods) 885ev_loop_new (unsigned int flags)
798{ 886{
799 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));
800 888
801 memset (loop, 0, sizeof (struct ev_loop)); 889 memset (loop, 0, sizeof (struct ev_loop));
802 890
803 loop_init (EV_A_ methods); 891 loop_init (EV_A_ flags);
804 892
805 if (ev_method (EV_A)) 893 if (ev_method (EV_A))
806 return loop; 894 return loop;
807 895
808 return 0; 896 return 0;
822} 910}
823 911
824#endif 912#endif
825 913
826#if EV_MULTIPLICITY 914#if EV_MULTIPLICITY
827struct ev_loop default_loop_struct;
828static struct ev_loop *default_loop;
829
830struct ev_loop * 915struct ev_loop *
916ev_default_loop_ (unsigned int flags)
831#else 917#else
832static int default_loop;
833
834int 918int
919ev_default_loop (unsigned int flags)
835#endif 920#endif
836ev_default_loop (int methods)
837{ 921{
838 if (sigpipe [0] == sigpipe [1]) 922 if (sigpipe [0] == sigpipe [1])
839 if (pipe (sigpipe)) 923 if (pipe (sigpipe))
840 return 0; 924 return 0;
841 925
842 if (!default_loop) 926 if (!ev_default_loop_ptr)
843 { 927 {
844#if EV_MULTIPLICITY 928#if EV_MULTIPLICITY
845 struct ev_loop *loop = default_loop = &default_loop_struct; 929 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
846#else 930#else
847 default_loop = 1; 931 ev_default_loop_ptr = 1;
848#endif 932#endif
849 933
850 loop_init (EV_A_ methods); 934 loop_init (EV_A_ flags);
851 935
852 if (ev_method (EV_A)) 936 if (ev_method (EV_A))
853 { 937 {
854 siginit (EV_A); 938 siginit (EV_A);
855 939
856#ifndef WIN32 940#ifndef _WIN32
857 ev_signal_init (&childev, childcb, SIGCHLD); 941 ev_signal_init (&childev, childcb, SIGCHLD);
858 ev_set_priority (&childev, EV_MAXPRI); 942 ev_set_priority (&childev, EV_MAXPRI);
859 ev_signal_start (EV_A_ &childev); 943 ev_signal_start (EV_A_ &childev);
860 ev_unref (EV_A); /* child watcher should not keep loop alive */ 944 ev_unref (EV_A); /* child watcher should not keep loop alive */
861#endif 945#endif
862 } 946 }
863 else 947 else
864 default_loop = 0; 948 ev_default_loop_ptr = 0;
865 } 949 }
866 950
867 return default_loop; 951 return ev_default_loop_ptr;
868} 952}
869 953
870void 954void
871ev_default_destroy (void) 955ev_default_destroy (void)
872{ 956{
873#if EV_MULTIPLICITY 957#if EV_MULTIPLICITY
874 struct ev_loop *loop = default_loop; 958 struct ev_loop *loop = ev_default_loop_ptr;
875#endif 959#endif
876 960
877#ifndef WIN32 961#ifndef _WIN32
878 ev_ref (EV_A); /* child watcher */ 962 ev_ref (EV_A); /* child watcher */
879 ev_signal_stop (EV_A_ &childev); 963 ev_signal_stop (EV_A_ &childev);
880#endif 964#endif
881 965
882 ev_ref (EV_A); /* signal watcher */ 966 ev_ref (EV_A); /* signal watcher */
890 974
891void 975void
892ev_default_fork (void) 976ev_default_fork (void)
893{ 977{
894#if EV_MULTIPLICITY 978#if EV_MULTIPLICITY
895 struct ev_loop *loop = default_loop; 979 struct ev_loop *loop = ev_default_loop_ptr;
896#endif 980#endif
897 981
898 if (method) 982 if (method)
899 postfork = 1; 983 postfork = 1;
900} 984}
924 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1008 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
925 1009
926 if (p->w) 1010 if (p->w)
927 { 1011 {
928 p->w->pending = 0; 1012 p->w->pending = 0;
929 p->w->cb (EV_A_ p->w, p->events); 1013 EV_CB_INVOKE (p->w, p->events);
930 } 1014 }
931 } 1015 }
932} 1016}
933 1017
934static void 1018static void
942 1026
943 /* first reschedule or stop timer */ 1027 /* first reschedule or stop timer */
944 if (w->repeat) 1028 if (w->repeat)
945 { 1029 {
946 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
947 ((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
948 downheap ((WT *)timers, timercnt, 0); 1036 downheap ((WT *)timers, timercnt, 0);
949 } 1037 }
950 else 1038 else
951 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1039 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
952 1040
953 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1041 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
954 } 1042 }
955} 1043}
956 1044
1045#if EV_PERIODICS
957static void 1046static void
958periodics_reify (EV_P) 1047periodics_reify (EV_P)
959{ 1048{
960 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1049 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
961 { 1050 {
962 struct ev_periodic *w = periodics [0]; 1051 struct ev_periodic *w = periodics [0];
963 1052
964 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1053 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
965 1054
966 /* first reschedule or stop timer */ 1055 /* first reschedule or stop timer */
967 if (w->reschedule_cb) 1056 if (w->reschedule_cb)
968 { 1057 {
969 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);
970
971 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));
972 downheap ((WT *)periodics, periodiccnt, 0); 1060 downheap ((WT *)periodics, periodiccnt, 0);
973 } 1061 }
974 else if (w->interval) 1062 else if (w->interval)
975 { 1063 {
976 ((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;
977 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));
978 downheap ((WT *)periodics, periodiccnt, 0); 1066 downheap ((WT *)periodics, periodiccnt, 0);
979 } 1067 }
980 else 1068 else
981 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1069 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
982 1070
993 for (i = 0; i < periodiccnt; ++i) 1081 for (i = 0; i < periodiccnt; ++i)
994 { 1082 {
995 struct ev_periodic *w = periodics [i]; 1083 struct ev_periodic *w = periodics [i];
996 1084
997 if (w->reschedule_cb) 1085 if (w->reschedule_cb)
998 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1086 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
999 else if (w->interval) 1087 else if (w->interval)
1000 ((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;
1001 } 1089 }
1002 1090
1003 /* now rebuild the heap */ 1091 /* now rebuild the heap */
1004 for (i = periodiccnt >> 1; i--; ) 1092 for (i = periodiccnt >> 1; i--; )
1005 downheap ((WT *)periodics, periodiccnt, i); 1093 downheap ((WT *)periodics, periodiccnt, i);
1006} 1094}
1095#endif
1007 1096
1008inline int 1097inline int
1009time_update_monotonic (EV_P) 1098time_update_monotonic (EV_P)
1010{ 1099{
1011 mn_now = get_clock (); 1100 mn_now = get_clock ();
1012 1101
1013 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1102 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1014 { 1103 {
1015 rt_now = rtmn_diff + mn_now; 1104 ev_rt_now = rtmn_diff + mn_now;
1016 return 0; 1105 return 0;
1017 } 1106 }
1018 else 1107 else
1019 { 1108 {
1020 now_floor = mn_now; 1109 now_floor = mn_now;
1021 rt_now = ev_time (); 1110 ev_rt_now = ev_time ();
1022 return 1; 1111 return 1;
1023 } 1112 }
1024} 1113}
1025 1114
1026static void 1115static void
1035 { 1124 {
1036 ev_tstamp odiff = rtmn_diff; 1125 ev_tstamp odiff = rtmn_diff;
1037 1126
1038 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 */
1039 { 1128 {
1040 rtmn_diff = rt_now - mn_now; 1129 rtmn_diff = ev_rt_now - mn_now;
1041 1130
1042 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1131 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1043 return; /* all is well */ 1132 return; /* all is well */
1044 1133
1045 rt_now = ev_time (); 1134 ev_rt_now = ev_time ();
1046 mn_now = get_clock (); 1135 mn_now = get_clock ();
1047 now_floor = mn_now; 1136 now_floor = mn_now;
1048 } 1137 }
1049 1138
1139# if EV_PERIODICS
1050 periodics_reschedule (EV_A); 1140 periodics_reschedule (EV_A);
1141# endif
1051 /* no timer adjustment, as the monotonic clock doesn't jump */ 1142 /* no timer adjustment, as the monotonic clock doesn't jump */
1052 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1143 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1053 } 1144 }
1054 } 1145 }
1055 else 1146 else
1056#endif 1147#endif
1057 { 1148 {
1058 rt_now = ev_time (); 1149 ev_rt_now = ev_time ();
1059 1150
1060 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))
1061 { 1152 {
1153#if EV_PERIODICS
1062 periodics_reschedule (EV_A); 1154 periodics_reschedule (EV_A);
1155#endif
1063 1156
1064 /* 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 */
1065 for (i = 0; i < timercnt; ++i) 1158 for (i = 0; i < timercnt; ++i)
1066 ((WT)timers [i])->at += rt_now - mn_now; 1159 ((WT)timers [i])->at += ev_rt_now - mn_now;
1067 } 1160 }
1068 1161
1069 mn_now = rt_now; 1162 mn_now = ev_rt_now;
1070 } 1163 }
1071} 1164}
1072 1165
1073void 1166void
1074ev_ref (EV_P) 1167ev_ref (EV_P)
1088ev_loop (EV_P_ int flags) 1181ev_loop (EV_P_ int flags)
1089{ 1182{
1090 double block; 1183 double block;
1091 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1184 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1092 1185
1093 do 1186 while (activecnt)
1094 { 1187 {
1095 /* queue check watchers (and execute them) */ 1188 /* queue check watchers (and execute them) */
1096 if (expect_false (preparecnt)) 1189 if (expect_false (preparecnt))
1097 { 1190 {
1098 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1191 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1114 if (expect_true (have_monotonic)) 1207 if (expect_true (have_monotonic))
1115 time_update_monotonic (EV_A); 1208 time_update_monotonic (EV_A);
1116 else 1209 else
1117#endif 1210#endif
1118 { 1211 {
1119 rt_now = ev_time (); 1212 ev_rt_now = ev_time ();
1120 mn_now = rt_now; 1213 mn_now = ev_rt_now;
1121 } 1214 }
1122 1215
1123 if (flags & EVLOOP_NONBLOCK || idlecnt) 1216 if (flags & EVLOOP_NONBLOCK || idlecnt)
1124 block = 0.; 1217 block = 0.;
1125 else 1218 else
1130 { 1223 {
1131 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1224 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1132 if (block > to) block = to; 1225 if (block > to) block = to;
1133 } 1226 }
1134 1227
1228#if EV_PERIODICS
1135 if (periodiccnt) 1229 if (periodiccnt)
1136 { 1230 {
1137 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1231 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1138 if (block > to) block = to; 1232 if (block > to) block = to;
1139 } 1233 }
1234#endif
1140 1235
1141 if (block < 0.) block = 0.; 1236 if (block < 0.) block = 0.;
1142 } 1237 }
1143 1238
1144 method_poll (EV_A_ block); 1239 method_poll (EV_A_ block);
1145 1240
1146 /* update rt_now, do magic */ 1241 /* update ev_rt_now, do magic */
1147 time_update (EV_A); 1242 time_update (EV_A);
1148 1243
1149 /* queue pending timers and reschedule them */ 1244 /* queue pending timers and reschedule them */
1150 timers_reify (EV_A); /* relative timers called last */ 1245 timers_reify (EV_A); /* relative timers called last */
1246#if EV_PERIODICS
1151 periodics_reify (EV_A); /* absolute timers called first */ 1247 periodics_reify (EV_A); /* absolute timers called first */
1248#endif
1152 1249
1153 /* queue idle watchers unless io or timers are pending */ 1250 /* queue idle watchers unless io or timers are pending */
1154 if (idlecnt && !any_pending (EV_A)) 1251 if (idlecnt && !any_pending (EV_A))
1155 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1252 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1156 1253
1157 /* queue check watchers, to be executed first */ 1254 /* queue check watchers, to be executed first */
1158 if (checkcnt) 1255 if (checkcnt)
1159 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1256 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1160 1257
1161 call_pending (EV_A); 1258 call_pending (EV_A);
1259
1260 if (loop_done)
1261 break;
1162 } 1262 }
1163 while (activecnt && !loop_done);
1164 1263
1165 if (loop_done != 2) 1264 if (loop_done != 2)
1166 loop_done = 0; 1265 loop_done = 0;
1167} 1266}
1168 1267
1247{ 1346{
1248 ev_clear_pending (EV_A_ (W)w); 1347 ev_clear_pending (EV_A_ (W)w);
1249 if (!ev_is_active (w)) 1348 if (!ev_is_active (w))
1250 return; 1349 return;
1251 1350
1351 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1352
1252 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1353 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1253 ev_stop (EV_A_ (W)w); 1354 ev_stop (EV_A_ (W)w);
1254 1355
1255 fd_change (EV_A_ w->fd); 1356 fd_change (EV_A_ w->fd);
1256} 1357}
1264 ((WT)w)->at += mn_now; 1365 ((WT)w)->at += mn_now;
1265 1366
1266 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.));
1267 1368
1268 ev_start (EV_A_ (W)w, ++timercnt); 1369 ev_start (EV_A_ (W)w, ++timercnt);
1269 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1370 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1270 timers [timercnt - 1] = w; 1371 timers [timercnt - 1] = w;
1271 upheap ((WT *)timers, timercnt - 1); 1372 upheap ((WT *)timers, timercnt - 1);
1272 1373
1273 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1374 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1274} 1375}
1283 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1384 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1284 1385
1285 if (((W)w)->active < timercnt--) 1386 if (((W)w)->active < timercnt--)
1286 { 1387 {
1287 timers [((W)w)->active - 1] = timers [timercnt]; 1388 timers [((W)w)->active - 1] = timers [timercnt];
1288 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1389 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1289 } 1390 }
1290 1391
1291 ((WT)w)->at = w->repeat; 1392 ((WT)w)->at -= mn_now;
1292 1393
1293 ev_stop (EV_A_ (W)w); 1394 ev_stop (EV_A_ (W)w);
1294} 1395}
1295 1396
1296void 1397void
1299 if (ev_is_active (w)) 1400 if (ev_is_active (w))
1300 { 1401 {
1301 if (w->repeat) 1402 if (w->repeat)
1302 { 1403 {
1303 ((WT)w)->at = mn_now + w->repeat; 1404 ((WT)w)->at = mn_now + w->repeat;
1304 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1405 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1305 } 1406 }
1306 else 1407 else
1307 ev_timer_stop (EV_A_ w); 1408 ev_timer_stop (EV_A_ w);
1308 } 1409 }
1309 else if (w->repeat) 1410 else if (w->repeat)
1411 {
1412 w->at = w->repeat;
1310 ev_timer_start (EV_A_ w); 1413 ev_timer_start (EV_A_ w);
1414 }
1311} 1415}
1312 1416
1417#if EV_PERIODICS
1313void 1418void
1314ev_periodic_start (EV_P_ struct ev_periodic *w) 1419ev_periodic_start (EV_P_ struct ev_periodic *w)
1315{ 1420{
1316 if (ev_is_active (w)) 1421 if (ev_is_active (w))
1317 return; 1422 return;
1318 1423
1319 if (w->reschedule_cb) 1424 if (w->reschedule_cb)
1320 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1425 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1321 else if (w->interval) 1426 else if (w->interval)
1322 { 1427 {
1323 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.));
1324 /* 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 */
1325 ((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;
1326 } 1431 }
1327 1432
1328 ev_start (EV_A_ (W)w, ++periodiccnt); 1433 ev_start (EV_A_ (W)w, ++periodiccnt);
1329 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1434 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1330 periodics [periodiccnt - 1] = w; 1435 periodics [periodiccnt - 1] = w;
1331 upheap ((WT *)periodics, periodiccnt - 1); 1436 upheap ((WT *)periodics, periodiccnt - 1);
1332 1437
1333 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1438 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1334} 1439}
1343 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1448 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1344 1449
1345 if (((W)w)->active < periodiccnt--) 1450 if (((W)w)->active < periodiccnt--)
1346 { 1451 {
1347 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1452 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1348 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1453 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1349 } 1454 }
1350 1455
1351 ev_stop (EV_A_ (W)w); 1456 ev_stop (EV_A_ (W)w);
1352} 1457}
1353 1458
1354void 1459void
1355ev_periodic_again (EV_P_ struct ev_periodic *w) 1460ev_periodic_again (EV_P_ struct ev_periodic *w)
1356{ 1461{
1462 /* TODO: use adjustheap and recalculation */
1357 ev_periodic_stop (EV_A_ w); 1463 ev_periodic_stop (EV_A_ w);
1358 ev_periodic_start (EV_A_ w); 1464 ev_periodic_start (EV_A_ w);
1359} 1465}
1466#endif
1360 1467
1361void 1468void
1362ev_idle_start (EV_P_ struct ev_idle *w) 1469ev_idle_start (EV_P_ struct ev_idle *w)
1363{ 1470{
1364 if (ev_is_active (w)) 1471 if (ev_is_active (w))
1365 return; 1472 return;
1366 1473
1367 ev_start (EV_A_ (W)w, ++idlecnt); 1474 ev_start (EV_A_ (W)w, ++idlecnt);
1368 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1475 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1369 idles [idlecnt - 1] = w; 1476 idles [idlecnt - 1] = w;
1370} 1477}
1371 1478
1372void 1479void
1373ev_idle_stop (EV_P_ struct ev_idle *w) 1480ev_idle_stop (EV_P_ struct ev_idle *w)
1374{ 1481{
1375 ev_clear_pending (EV_A_ (W)w); 1482 ev_clear_pending (EV_A_ (W)w);
1376 if (ev_is_active (w)) 1483 if (!ev_is_active (w))
1377 return; 1484 return;
1378 1485
1379 idles [((W)w)->active - 1] = idles [--idlecnt]; 1486 idles [((W)w)->active - 1] = idles [--idlecnt];
1380 ev_stop (EV_A_ (W)w); 1487 ev_stop (EV_A_ (W)w);
1381} 1488}
1385{ 1492{
1386 if (ev_is_active (w)) 1493 if (ev_is_active (w))
1387 return; 1494 return;
1388 1495
1389 ev_start (EV_A_ (W)w, ++preparecnt); 1496 ev_start (EV_A_ (W)w, ++preparecnt);
1390 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1497 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1391 prepares [preparecnt - 1] = w; 1498 prepares [preparecnt - 1] = w;
1392} 1499}
1393 1500
1394void 1501void
1395ev_prepare_stop (EV_P_ struct ev_prepare *w) 1502ev_prepare_stop (EV_P_ struct ev_prepare *w)
1396{ 1503{
1397 ev_clear_pending (EV_A_ (W)w); 1504 ev_clear_pending (EV_A_ (W)w);
1398 if (ev_is_active (w)) 1505 if (!ev_is_active (w))
1399 return; 1506 return;
1400 1507
1401 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1508 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1402 ev_stop (EV_A_ (W)w); 1509 ev_stop (EV_A_ (W)w);
1403} 1510}
1407{ 1514{
1408 if (ev_is_active (w)) 1515 if (ev_is_active (w))
1409 return; 1516 return;
1410 1517
1411 ev_start (EV_A_ (W)w, ++checkcnt); 1518 ev_start (EV_A_ (W)w, ++checkcnt);
1412 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1519 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1413 checks [checkcnt - 1] = w; 1520 checks [checkcnt - 1] = w;
1414} 1521}
1415 1522
1416void 1523void
1417ev_check_stop (EV_P_ struct ev_check *w) 1524ev_check_stop (EV_P_ struct ev_check *w)
1418{ 1525{
1419 ev_clear_pending (EV_A_ (W)w); 1526 ev_clear_pending (EV_A_ (W)w);
1420 if (ev_is_active (w)) 1527 if (!ev_is_active (w))
1421 return; 1528 return;
1422 1529
1423 checks [((W)w)->active - 1] = checks [--checkcnt]; 1530 checks [((W)w)->active - 1] = checks [--checkcnt];
1424 ev_stop (EV_A_ (W)w); 1531 ev_stop (EV_A_ (W)w);
1425} 1532}
1430 1537
1431void 1538void
1432ev_signal_start (EV_P_ struct ev_signal *w) 1539ev_signal_start (EV_P_ struct ev_signal *w)
1433{ 1540{
1434#if EV_MULTIPLICITY 1541#if EV_MULTIPLICITY
1435 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));
1436#endif 1543#endif
1437 if (ev_is_active (w)) 1544 if (ev_is_active (w))
1438 return; 1545 return;
1439 1546
1440 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));
1443 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1550 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1444 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1551 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1445 1552
1446 if (!((WL)w)->next) 1553 if (!((WL)w)->next)
1447 { 1554 {
1448#if WIN32 1555#if _WIN32
1449 signal (w->signum, sighandler); 1556 signal (w->signum, sighandler);
1450#else 1557#else
1451 struct sigaction sa; 1558 struct sigaction sa;
1452 sa.sa_handler = sighandler; 1559 sa.sa_handler = sighandler;
1453 sigfillset (&sa.sa_mask); 1560 sigfillset (&sa.sa_mask);
1473 1580
1474void 1581void
1475ev_child_start (EV_P_ struct ev_child *w) 1582ev_child_start (EV_P_ struct ev_child *w)
1476{ 1583{
1477#if EV_MULTIPLICITY 1584#if EV_MULTIPLICITY
1478 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));
1479#endif 1586#endif
1480 if (ev_is_active (w)) 1587 if (ev_is_active (w))
1481 return; 1588 return;
1482 1589
1483 ev_start (EV_A_ (W)w, 1); 1590 ev_start (EV_A_ (W)w, 1);
1486 1593
1487void 1594void
1488ev_child_stop (EV_P_ struct ev_child *w) 1595ev_child_stop (EV_P_ struct ev_child *w)
1489{ 1596{
1490 ev_clear_pending (EV_A_ (W)w); 1597 ev_clear_pending (EV_A_ (W)w);
1491 if (ev_is_active (w)) 1598 if (!ev_is_active (w))
1492 return; 1599 return;
1493 1600
1494 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1601 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1495 ev_stop (EV_A_ (W)w); 1602 ev_stop (EV_A_ (W)w);
1496} 1603}
1540 else 1647 else
1541 { 1648 {
1542 once->cb = cb; 1649 once->cb = cb;
1543 once->arg = arg; 1650 once->arg = arg;
1544 1651
1545 ev_watcher_init (&once->io, once_cb_io); 1652 ev_init (&once->io, once_cb_io);
1546 if (fd >= 0) 1653 if (fd >= 0)
1547 { 1654 {
1548 ev_io_set (&once->io, fd, events); 1655 ev_io_set (&once->io, fd, events);
1549 ev_io_start (EV_A_ &once->io); 1656 ev_io_start (EV_A_ &once->io);
1550 } 1657 }
1551 1658
1552 ev_watcher_init (&once->to, once_cb_to); 1659 ev_init (&once->to, once_cb_to);
1553 if (timeout >= 0.) 1660 if (timeout >= 0.)
1554 { 1661 {
1555 ev_timer_set (&once->to, timeout, 0.); 1662 ev_timer_set (&once->to, timeout, 0.);
1556 ev_timer_start (EV_A_ &once->to); 1663 ev_timer_start (EV_A_ &once->to);
1557 } 1664 }
1558 } 1665 }
1559} 1666}
1560 1667
1668#ifdef __cplusplus
1669}
1670#endif
1671

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines