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

Comparing libev/ev.c (file contents):
Revision 1.89 by root, Sat Nov 10 19:48:44 2007 UTC vs.
Revision 1.130 by root, Fri Nov 23 05:13:48 2007 UTC

35 35
36#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
37# include "config.h" 37# include "config.h"
38 38
39# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC
40# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif
43# ifndef EV_USE_REALTIME
41# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif
46# else
47# ifndef EV_USE_MONOTONIC
48# define EV_USE_MONOTONIC 0
49# endif
50# ifndef EV_USE_REALTIME
51# define EV_USE_REALTIME 0
52# endif
42# endif 53# endif
43 54
55# ifndef EV_USE_SELECT
44# if HAVE_SELECT && HAVE_SYS_SELECT_H 56# if HAVE_SELECT && HAVE_SYS_SELECT_H
45# define EV_USE_SELECT 1 57# define EV_USE_SELECT 1
58# else
59# define EV_USE_SELECT 0
60# endif
46# endif 61# endif
47 62
63# ifndef EV_USE_POLL
48# if HAVE_POLL && HAVE_POLL_H 64# if HAVE_POLL && HAVE_POLL_H
49# define EV_USE_POLL 1 65# define EV_USE_POLL 1
66# else
67# define EV_USE_POLL 0
68# endif
50# endif 69# endif
51 70
71# ifndef EV_USE_EPOLL
52# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 72# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
53# define EV_USE_EPOLL 1 73# define EV_USE_EPOLL 1
74# else
75# define EV_USE_EPOLL 0
76# endif
54# endif 77# endif
55 78
79# ifndef EV_USE_KQUEUE
56# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 80# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
57# define EV_USE_KQUEUE 1 81# define EV_USE_KQUEUE 1
82# else
83# define EV_USE_KQUEUE 0
84# endif
85# endif
86
87# ifndef EV_USE_PORT
88# if HAVE_PORT_H && HAVE_PORT_CREATE
89# define EV_USE_PORT 1
90# else
91# define EV_USE_PORT 0
92# endif
58# endif 93# endif
59 94
60#endif 95#endif
61 96
62#include <math.h> 97#include <math.h>
71#include <sys/types.h> 106#include <sys/types.h>
72#include <time.h> 107#include <time.h>
73 108
74#include <signal.h> 109#include <signal.h>
75 110
76#ifndef WIN32 111#ifndef _WIN32
77# include <unistd.h> 112# include <unistd.h>
78# include <sys/time.h> 113# include <sys/time.h>
79# include <sys/wait.h> 114# include <sys/wait.h>
115#else
116# define WIN32_LEAN_AND_MEAN
117# include <windows.h>
118# ifndef EV_SELECT_IS_WINSOCKET
119# define EV_SELECT_IS_WINSOCKET 1
80#endif 120# endif
121#endif
122
81/**/ 123/**/
82 124
83#ifndef EV_USE_MONOTONIC 125#ifndef EV_USE_MONOTONIC
84# define EV_USE_MONOTONIC 1 126# define EV_USE_MONOTONIC 0
127#endif
128
129#ifndef EV_USE_REALTIME
130# define EV_USE_REALTIME 0
85#endif 131#endif
86 132
87#ifndef EV_USE_SELECT 133#ifndef EV_USE_SELECT
88# define EV_USE_SELECT 1 134# define EV_USE_SELECT 1
89#endif 135#endif
90 136
91#ifndef EV_USE_POLL 137#ifndef EV_USE_POLL
92# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 138# ifdef _WIN32
139# define EV_USE_POLL 0
140# else
141# define EV_USE_POLL 1
142# endif
93#endif 143#endif
94 144
95#ifndef EV_USE_EPOLL 145#ifndef EV_USE_EPOLL
96# define EV_USE_EPOLL 0 146# define EV_USE_EPOLL 0
97#endif 147#endif
98 148
99#ifndef EV_USE_KQUEUE 149#ifndef EV_USE_KQUEUE
100# define EV_USE_KQUEUE 0 150# define EV_USE_KQUEUE 0
101#endif 151#endif
102 152
103#ifndef EV_USE_WIN32
104# ifdef WIN32
105# define EV_USE_WIN32 0 /* it does not exist, use select */
106# undef EV_USE_SELECT
107# define EV_USE_SELECT 1
108# else
109# define EV_USE_WIN32 0
110# endif
111#endif
112
113#ifndef EV_USE_REALTIME 153#ifndef EV_USE_PORT
114# define EV_USE_REALTIME 1 154# define EV_USE_PORT 0
115#endif 155#endif
116 156
117/**/ 157/**/
118 158
119#ifndef CLOCK_MONOTONIC 159#ifndef CLOCK_MONOTONIC
124#ifndef CLOCK_REALTIME 164#ifndef CLOCK_REALTIME
125# undef EV_USE_REALTIME 165# undef EV_USE_REALTIME
126# define EV_USE_REALTIME 0 166# define EV_USE_REALTIME 0
127#endif 167#endif
128 168
169#if EV_SELECT_IS_WINSOCKET
170# include <winsock.h>
171#endif
172
129/**/ 173/**/
130 174
131#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 175#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
132#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 176#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
133#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 177#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
134/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 178/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
135 179
136#ifdef EV_H 180#ifdef EV_H
137# include EV_H 181# include EV_H
138#else 182#else
139# include "ev.h" 183# include "ev.h"
140#endif 184#endif
141 185
142#if __GNUC__ >= 3 186#if __GNUC__ >= 3
143# define expect(expr,value) __builtin_expect ((expr),(value)) 187# define expect(expr,value) __builtin_expect ((expr),(value))
144# define inline inline 188# define inline static inline
145#else 189#else
146# define expect(expr,value) (expr) 190# define expect(expr,value) (expr)
147# define inline static 191# define inline static
148#endif 192#endif
149 193
151#define expect_true(expr) expect ((expr) != 0, 1) 195#define expect_true(expr) expect ((expr) != 0, 1)
152 196
153#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 197#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
154#define ABSPRI(w) ((w)->priority - EV_MINPRI) 198#define ABSPRI(w) ((w)->priority - EV_MINPRI)
155 199
200#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
201#define EMPTY2(a,b) /* used to suppress some warnings */
202
156typedef struct ev_watcher *W; 203typedef struct ev_watcher *W;
157typedef struct ev_watcher_list *WL; 204typedef struct ev_watcher_list *WL;
158typedef struct ev_watcher_time *WT; 205typedef struct ev_watcher_time *WT;
159 206
160static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 207static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
161 208
209#ifdef _WIN32
162#include "ev_win32.c" 210# include "ev_win32.c"
211#endif
163 212
164/*****************************************************************************/ 213/*****************************************************************************/
165 214
166static void (*syserr_cb)(const char *msg); 215static void (*syserr_cb)(const char *msg);
167 216
214typedef struct 263typedef struct
215{ 264{
216 WL head; 265 WL head;
217 unsigned char events; 266 unsigned char events;
218 unsigned char reify; 267 unsigned char reify;
268#if EV_SELECT_IS_WINSOCKET
269 SOCKET handle;
270#endif
219} ANFD; 271} ANFD;
220 272
221typedef struct 273typedef struct
222{ 274{
223 W w; 275 W w;
227#if EV_MULTIPLICITY 279#if EV_MULTIPLICITY
228 280
229 struct ev_loop 281 struct ev_loop
230 { 282 {
231 ev_tstamp ev_rt_now; 283 ev_tstamp ev_rt_now;
284 #define ev_rt_now ((loop)->ev_rt_now)
232 #define VAR(name,decl) decl; 285 #define VAR(name,decl) decl;
233 #include "ev_vars.h" 286 #include "ev_vars.h"
234 #undef VAR 287 #undef VAR
235 }; 288 };
236 #include "ev_wrap.h" 289 #include "ev_wrap.h"
237 290
238 struct ev_loop default_loop_struct; 291 static struct ev_loop default_loop_struct;
239 static struct ev_loop *default_loop; 292 struct ev_loop *ev_default_loop_ptr;
240 293
241#else 294#else
242 295
243 ev_tstamp ev_rt_now; 296 ev_tstamp ev_rt_now;
244 #define VAR(name,decl) static decl; 297 #define VAR(name,decl) static decl;
245 #include "ev_vars.h" 298 #include "ev_vars.h"
246 #undef VAR 299 #undef VAR
247 300
248 static int default_loop; 301 static int ev_default_loop_ptr;
249 302
250#endif 303#endif
251 304
252/*****************************************************************************/ 305/*****************************************************************************/
253 306
254inline ev_tstamp 307ev_tstamp
255ev_time (void) 308ev_time (void)
256{ 309{
257#if EV_USE_REALTIME 310#if EV_USE_REALTIME
258 struct timespec ts; 311 struct timespec ts;
259 clock_gettime (CLOCK_REALTIME, &ts); 312 clock_gettime (CLOCK_REALTIME, &ts);
286{ 339{
287 return ev_rt_now; 340 return ev_rt_now;
288} 341}
289#endif 342#endif
290 343
291#define array_roundsize(type,n) ((n) | 4 & ~3) 344#define array_roundsize(type,n) (((n) | 4) & ~3)
292 345
293#define array_needsize(type,base,cur,cnt,init) \ 346#define array_needsize(type,base,cur,cnt,init) \
294 if (expect_false ((cnt) > cur)) \ 347 if (expect_false ((cnt) > cur)) \
295 { \ 348 { \
296 int newcnt = cur; \ 349 int newcnt = cur; \
311 stem ## max = array_roundsize (stem ## cnt >> 1); \ 364 stem ## max = array_roundsize (stem ## cnt >> 1); \
312 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 365 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
313 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 366 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
314 } 367 }
315 368
316/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
317/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
318#define array_free_microshit(stem) \
319 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
320
321#define array_free(stem, idx) \ 369#define array_free(stem, idx) \
322 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 370 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
323 371
324/*****************************************************************************/ 372/*****************************************************************************/
325 373
339void 387void
340ev_feed_event (EV_P_ void *w, int revents) 388ev_feed_event (EV_P_ void *w, int revents)
341{ 389{
342 W w_ = (W)w; 390 W w_ = (W)w;
343 391
344 if (w_->pending) 392 if (expect_false (w_->pending))
345 { 393 {
346 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 394 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
347 return; 395 return;
348 } 396 }
349 397
350 w_->pending = ++pendingcnt [ABSPRI (w_)]; 398 w_->pending = ++pendingcnt [ABSPRI (w_)];
351 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 399 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
352 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 400 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
353 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 401 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
354} 402}
355 403
356static void 404static void
383 fd_event (EV_A_ fd, revents); 431 fd_event (EV_A_ fd, revents);
384} 432}
385 433
386/*****************************************************************************/ 434/*****************************************************************************/
387 435
388static void 436inline void
389fd_reify (EV_P) 437fd_reify (EV_P)
390{ 438{
391 int i; 439 int i;
392 440
393 for (i = 0; i < fdchangecnt; ++i) 441 for (i = 0; i < fdchangecnt; ++i)
399 int events = 0; 447 int events = 0;
400 448
401 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 449 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
402 events |= w->events; 450 events |= w->events;
403 451
452#if EV_SELECT_IS_WINSOCKET
453 if (events)
454 {
455 unsigned long argp;
456 anfd->handle = _get_osfhandle (fd);
457 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
458 }
459#endif
460
404 anfd->reify = 0; 461 anfd->reify = 0;
405 462
406 method_modify (EV_A_ fd, anfd->events, events); 463 backend_modify (EV_A_ fd, anfd->events, events);
407 anfd->events = events; 464 anfd->events = events;
408 } 465 }
409 466
410 fdchangecnt = 0; 467 fdchangecnt = 0;
411} 468}
412 469
413static void 470static void
414fd_change (EV_P_ int fd) 471fd_change (EV_P_ int fd)
415{ 472{
416 if (anfds [fd].reify) 473 if (expect_false (anfds [fd].reify))
417 return; 474 return;
418 475
419 anfds [fd].reify = 1; 476 anfds [fd].reify = 1;
420 477
421 ++fdchangecnt; 478 ++fdchangecnt;
422 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 479 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
423 fdchanges [fdchangecnt - 1] = fd; 480 fdchanges [fdchangecnt - 1] = fd;
424} 481}
425 482
426static void 483static void
427fd_kill (EV_P_ int fd) 484fd_kill (EV_P_ int fd)
433 ev_io_stop (EV_A_ w); 490 ev_io_stop (EV_A_ w);
434 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 491 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
435 } 492 }
436} 493}
437 494
438static int 495inline int
439fd_valid (int fd) 496fd_valid (int fd)
440{ 497{
441#ifdef WIN32 498#ifdef _WIN32
442 return !!win32_get_osfhandle (fd); 499 return _get_osfhandle (fd) != -1;
443#else 500#else
444 return fcntl (fd, F_GETFD) != -1; 501 return fcntl (fd, F_GETFD) != -1;
445#endif 502#endif
446} 503}
447 504
469 fd_kill (EV_A_ fd); 526 fd_kill (EV_A_ fd);
470 return; 527 return;
471 } 528 }
472} 529}
473 530
474/* usually called after fork if method needs to re-arm all fds from scratch */ 531/* usually called after fork if backend needs to re-arm all fds from scratch */
475static void 532static void
476fd_rearm_all (EV_P) 533fd_rearm_all (EV_P)
477{ 534{
478 int fd; 535 int fd;
479 536
528 heap [k] = w; 585 heap [k] = w;
529 ((W)heap [k])->active = k + 1; 586 ((W)heap [k])->active = k + 1;
530} 587}
531 588
532inline void 589inline void
533adjustheap (WT *heap, int N, int k, ev_tstamp at) 590adjustheap (WT *heap, int N, int k)
534{ 591{
535 ev_tstamp old_at = heap [k]->at; 592 upheap (heap, k);
536 heap [k]->at = at;
537
538 if (old_at < at)
539 downheap (heap, N, k); 593 downheap (heap, N, k);
540 else
541 upheap (heap, k);
542} 594}
543 595
544/*****************************************************************************/ 596/*****************************************************************************/
545 597
546typedef struct 598typedef struct
569} 621}
570 622
571static void 623static void
572sighandler (int signum) 624sighandler (int signum)
573{ 625{
574#if WIN32 626#if _WIN32
575 signal (signum, sighandler); 627 signal (signum, sighandler);
576#endif 628#endif
577 629
578 signals [signum - 1].gotsig = 1; 630 signals [signum - 1].gotsig = 1;
579 631
580 if (!gotsig) 632 if (!gotsig)
581 { 633 {
582 int old_errno = errno; 634 int old_errno = errno;
583 gotsig = 1; 635 gotsig = 1;
584#ifdef WIN32
585 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
586#else
587 write (sigpipe [1], &signum, 1); 636 write (sigpipe [1], &signum, 1);
588#endif
589 errno = old_errno; 637 errno = old_errno;
590 } 638 }
591} 639}
592 640
593void 641void
594ev_feed_signal_event (EV_P_ int signum) 642ev_feed_signal_event (EV_P_ int signum)
595{ 643{
596 WL w; 644 WL w;
597 645
598#if EV_MULTIPLICITY 646#if EV_MULTIPLICITY
599 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 647 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
600#endif 648#endif
601 649
602 --signum; 650 --signum;
603 651
604 if (signum < 0 || signum >= signalmax) 652 if (signum < 0 || signum >= signalmax)
613static void 661static void
614sigcb (EV_P_ struct ev_io *iow, int revents) 662sigcb (EV_P_ struct ev_io *iow, int revents)
615{ 663{
616 int signum; 664 int signum;
617 665
618#ifdef WIN32
619 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
620#else
621 read (sigpipe [0], &revents, 1); 666 read (sigpipe [0], &revents, 1);
622#endif
623 gotsig = 0; 667 gotsig = 0;
624 668
625 for (signum = signalmax; signum--; ) 669 for (signum = signalmax; signum--; )
626 if (signals [signum].gotsig) 670 if (signals [signum].gotsig)
627 ev_feed_signal_event (EV_A_ signum + 1); 671 ev_feed_signal_event (EV_A_ signum + 1);
628} 672}
629 673
630static void 674static void
675fd_intern (int fd)
676{
677#ifdef _WIN32
678 int arg = 1;
679 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
680#else
681 fcntl (fd, F_SETFD, FD_CLOEXEC);
682 fcntl (fd, F_SETFL, O_NONBLOCK);
683#endif
684}
685
686static void
631siginit (EV_P) 687siginit (EV_P)
632{ 688{
633#ifndef WIN32 689 fd_intern (sigpipe [0]);
634 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 690 fd_intern (sigpipe [1]);
635 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
636
637 /* rather than sort out wether we really need nb, set it */
638 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
639 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
640#endif
641 691
642 ev_io_set (&sigev, sigpipe [0], EV_READ); 692 ev_io_set (&sigev, sigpipe [0], EV_READ);
643 ev_io_start (EV_A_ &sigev); 693 ev_io_start (EV_A_ &sigev);
644 ev_unref (EV_A); /* child watcher should not keep loop alive */ 694 ev_unref (EV_A); /* child watcher should not keep loop alive */
645} 695}
646 696
647/*****************************************************************************/ 697/*****************************************************************************/
648 698
649static struct ev_child *childs [PID_HASHSIZE]; 699static struct ev_child *childs [PID_HASHSIZE];
650 700
651#ifndef WIN32 701#ifndef _WIN32
652 702
653static struct ev_signal childev; 703static struct ev_signal childev;
654 704
655#ifndef WCONTINUED 705#ifndef WCONTINUED
656# define WCONTINUED 0 706# define WCONTINUED 0
688 738
689#endif 739#endif
690 740
691/*****************************************************************************/ 741/*****************************************************************************/
692 742
743#if EV_USE_PORT
744# include "ev_port.c"
745#endif
693#if EV_USE_KQUEUE 746#if EV_USE_KQUEUE
694# include "ev_kqueue.c" 747# include "ev_kqueue.c"
695#endif 748#endif
696#if EV_USE_EPOLL 749#if EV_USE_EPOLL
697# include "ev_epoll.c" 750# include "ev_epoll.c"
717 770
718/* return true if we are running with elevated privileges and should ignore env variables */ 771/* return true if we are running with elevated privileges and should ignore env variables */
719static int 772static int
720enable_secure (void) 773enable_secure (void)
721{ 774{
722#ifdef WIN32 775#ifdef _WIN32
723 return 0; 776 return 0;
724#else 777#else
725 return getuid () != geteuid () 778 return getuid () != geteuid ()
726 || getgid () != getegid (); 779 || getgid () != getegid ();
727#endif 780#endif
728} 781}
729 782
730int 783unsigned int
731ev_method (EV_P) 784ev_supported_backends (void)
732{ 785{
733 return method; 786 unsigned int flags = 0;
734}
735 787
736static void 788 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
737loop_init (EV_P_ int methods) 789 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
790 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
791 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
792 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
793
794 return flags;
795}
796
797unsigned int
798ev_recommended_backends (void)
738{ 799{
739 if (!method) 800 unsigned int flags = ev_recommended_backends ();
801
802#ifndef __NetBSD__
803 /* kqueue is borked on everything but netbsd apparently */
804 /* it usually doesn't work correctly on anything but sockets and pipes */
805 flags &= ~EVBACKEND_KQUEUE;
806#endif
807#ifdef __APPLE__
808 // flags &= ~EVBACKEND_KQUEUE; for documentation
809 flags &= ~EVBACKEND_POLL;
810#endif
811
812 return flags;
813}
814
815unsigned int
816ev_backend (EV_P)
817{
818 return backend;
819}
820
821static void
822loop_init (EV_P_ unsigned int flags)
823{
824 if (!backend)
740 { 825 {
741#if EV_USE_MONOTONIC 826#if EV_USE_MONOTONIC
742 { 827 {
743 struct timespec ts; 828 struct timespec ts;
744 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 829 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
749 ev_rt_now = ev_time (); 834 ev_rt_now = ev_time ();
750 mn_now = get_clock (); 835 mn_now = get_clock ();
751 now_floor = mn_now; 836 now_floor = mn_now;
752 rtmn_diff = ev_rt_now - mn_now; 837 rtmn_diff = ev_rt_now - mn_now;
753 838
754 if (methods == EVMETHOD_AUTO) 839 if (!(flags & EVFLAG_NOENV)
755 if (!enable_secure () && getenv ("LIBEV_METHODS")) 840 && !enable_secure ()
841 && getenv ("LIBEV_FLAGS"))
756 methods = atoi (getenv ("LIBEV_METHODS")); 842 flags = atoi (getenv ("LIBEV_FLAGS"));
757 else
758 methods = EVMETHOD_ANY;
759 843
760 method = 0; 844 if (!(flags & 0x0000ffffUL))
761#if EV_USE_WIN32 845 flags |= ev_recommended_backends ();
762 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 846
847 backend = 0;
848#if EV_USE_PORT
849 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
763#endif 850#endif
764#if EV_USE_KQUEUE 851#if EV_USE_KQUEUE
765 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 852 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
766#endif 853#endif
767#if EV_USE_EPOLL 854#if EV_USE_EPOLL
768 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 855 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
769#endif 856#endif
770#if EV_USE_POLL 857#if EV_USE_POLL
771 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 858 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
772#endif 859#endif
773#if EV_USE_SELECT 860#if EV_USE_SELECT
774 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 861 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
775#endif 862#endif
776 863
777 ev_init (&sigev, sigcb); 864 ev_init (&sigev, sigcb);
778 ev_set_priority (&sigev, EV_MAXPRI); 865 ev_set_priority (&sigev, EV_MAXPRI);
779 } 866 }
780} 867}
781 868
782void 869static void
783loop_destroy (EV_P) 870loop_destroy (EV_P)
784{ 871{
785 int i; 872 int i;
786 873
787#if EV_USE_WIN32 874#if EV_USE_PORT
788 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 875 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
789#endif 876#endif
790#if EV_USE_KQUEUE 877#if EV_USE_KQUEUE
791 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 878 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
792#endif 879#endif
793#if EV_USE_EPOLL 880#if EV_USE_EPOLL
794 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 881 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
795#endif 882#endif
796#if EV_USE_POLL 883#if EV_USE_POLL
797 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 884 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
798#endif 885#endif
799#if EV_USE_SELECT 886#if EV_USE_SELECT
800 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 887 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
801#endif 888#endif
802 889
803 for (i = NUMPRI; i--; ) 890 for (i = NUMPRI; i--; )
804 array_free (pending, [i]); 891 array_free (pending, [i]);
805 892
806 /* have to use the microsoft-never-gets-it-right macro */ 893 /* have to use the microsoft-never-gets-it-right macro */
807 array_free_microshit (fdchange); 894 array_free (fdchange, EMPTY0);
808 array_free_microshit (timer); 895 array_free (timer, EMPTY0);
809 array_free_microshit (periodic); 896#if EV_PERIODICS
810 array_free_microshit (idle); 897 array_free (periodic, EMPTY0);
811 array_free_microshit (prepare); 898#endif
812 array_free_microshit (check); 899 array_free (idle, EMPTY0);
900 array_free (prepare, EMPTY0);
901 array_free (check, EMPTY0);
813 902
814 method = 0; 903 backend = 0;
815} 904}
816 905
817static void 906static void
818loop_fork (EV_P) 907loop_fork (EV_P)
819{ 908{
909#if EV_USE_PORT
910 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
911#endif
912#if EV_USE_KQUEUE
913 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
914#endif
820#if EV_USE_EPOLL 915#if EV_USE_EPOLL
821 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 916 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
822#endif
823#if EV_USE_KQUEUE
824 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
825#endif 917#endif
826 918
827 if (ev_is_active (&sigev)) 919 if (ev_is_active (&sigev))
828 { 920 {
829 /* default loop */ 921 /* default loop */
842 postfork = 0; 934 postfork = 0;
843} 935}
844 936
845#if EV_MULTIPLICITY 937#if EV_MULTIPLICITY
846struct ev_loop * 938struct ev_loop *
847ev_loop_new (int methods) 939ev_loop_new (unsigned int flags)
848{ 940{
849 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 941 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
850 942
851 memset (loop, 0, sizeof (struct ev_loop)); 943 memset (loop, 0, sizeof (struct ev_loop));
852 944
853 loop_init (EV_A_ methods); 945 loop_init (EV_A_ flags);
854 946
855 if (ev_method (EV_A)) 947 if (ev_backend (EV_A))
856 return loop; 948 return loop;
857 949
858 return 0; 950 return 0;
859} 951}
860 952
873 965
874#endif 966#endif
875 967
876#if EV_MULTIPLICITY 968#if EV_MULTIPLICITY
877struct ev_loop * 969struct ev_loop *
970ev_default_loop_init (unsigned int flags)
878#else 971#else
879int 972int
973ev_default_loop (unsigned int flags)
880#endif 974#endif
881ev_default_loop (int methods)
882{ 975{
883 if (sigpipe [0] == sigpipe [1]) 976 if (sigpipe [0] == sigpipe [1])
884 if (pipe (sigpipe)) 977 if (pipe (sigpipe))
885 return 0; 978 return 0;
886 979
887 if (!default_loop) 980 if (!ev_default_loop_ptr)
888 { 981 {
889#if EV_MULTIPLICITY 982#if EV_MULTIPLICITY
890 struct ev_loop *loop = default_loop = &default_loop_struct; 983 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
891#else 984#else
892 default_loop = 1; 985 ev_default_loop_ptr = 1;
893#endif 986#endif
894 987
895 loop_init (EV_A_ methods); 988 loop_init (EV_A_ flags);
896 989
897 if (ev_method (EV_A)) 990 if (ev_backend (EV_A))
898 { 991 {
899 siginit (EV_A); 992 siginit (EV_A);
900 993
901#ifndef WIN32 994#ifndef _WIN32
902 ev_signal_init (&childev, childcb, SIGCHLD); 995 ev_signal_init (&childev, childcb, SIGCHLD);
903 ev_set_priority (&childev, EV_MAXPRI); 996 ev_set_priority (&childev, EV_MAXPRI);
904 ev_signal_start (EV_A_ &childev); 997 ev_signal_start (EV_A_ &childev);
905 ev_unref (EV_A); /* child watcher should not keep loop alive */ 998 ev_unref (EV_A); /* child watcher should not keep loop alive */
906#endif 999#endif
907 } 1000 }
908 else 1001 else
909 default_loop = 0; 1002 ev_default_loop_ptr = 0;
910 } 1003 }
911 1004
912 return default_loop; 1005 return ev_default_loop_ptr;
913} 1006}
914 1007
915void 1008void
916ev_default_destroy (void) 1009ev_default_destroy (void)
917{ 1010{
918#if EV_MULTIPLICITY 1011#if EV_MULTIPLICITY
919 struct ev_loop *loop = default_loop; 1012 struct ev_loop *loop = ev_default_loop_ptr;
920#endif 1013#endif
921 1014
922#ifndef WIN32 1015#ifndef _WIN32
923 ev_ref (EV_A); /* child watcher */ 1016 ev_ref (EV_A); /* child watcher */
924 ev_signal_stop (EV_A_ &childev); 1017 ev_signal_stop (EV_A_ &childev);
925#endif 1018#endif
926 1019
927 ev_ref (EV_A); /* signal watcher */ 1020 ev_ref (EV_A); /* signal watcher */
935 1028
936void 1029void
937ev_default_fork (void) 1030ev_default_fork (void)
938{ 1031{
939#if EV_MULTIPLICITY 1032#if EV_MULTIPLICITY
940 struct ev_loop *loop = default_loop; 1033 struct ev_loop *loop = ev_default_loop_ptr;
941#endif 1034#endif
942 1035
943 if (method) 1036 if (backend)
944 postfork = 1; 1037 postfork = 1;
945} 1038}
946 1039
947/*****************************************************************************/ 1040/*****************************************************************************/
948 1041
956 return 1; 1049 return 1;
957 1050
958 return 0; 1051 return 0;
959} 1052}
960 1053
961static void 1054inline void
962call_pending (EV_P) 1055call_pending (EV_P)
963{ 1056{
964 int pri; 1057 int pri;
965 1058
966 for (pri = NUMPRI; pri--; ) 1059 for (pri = NUMPRI; pri--; )
967 while (pendingcnt [pri]) 1060 while (pendingcnt [pri])
968 { 1061 {
969 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1062 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
970 1063
971 if (p->w) 1064 if (expect_true (p->w))
972 { 1065 {
973 p->w->pending = 0; 1066 p->w->pending = 0;
974 EV_CB_INVOKE (p->w, p->events); 1067 EV_CB_INVOKE (p->w, p->events);
975 } 1068 }
976 } 1069 }
977} 1070}
978 1071
979static void 1072inline void
980timers_reify (EV_P) 1073timers_reify (EV_P)
981{ 1074{
982 while (timercnt && ((WT)timers [0])->at <= mn_now) 1075 while (timercnt && ((WT)timers [0])->at <= mn_now)
983 { 1076 {
984 struct ev_timer *w = timers [0]; 1077 struct ev_timer *w = timers [0];
987 1080
988 /* first reschedule or stop timer */ 1081 /* first reschedule or stop timer */
989 if (w->repeat) 1082 if (w->repeat)
990 { 1083 {
991 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1084 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1085
992 ((WT)w)->at = mn_now + w->repeat; 1086 ((WT)w)->at += w->repeat;
1087 if (((WT)w)->at < mn_now)
1088 ((WT)w)->at = mn_now;
1089
993 downheap ((WT *)timers, timercnt, 0); 1090 downheap ((WT *)timers, timercnt, 0);
994 } 1091 }
995 else 1092 else
996 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1093 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
997 1094
998 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1095 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
999 } 1096 }
1000} 1097}
1001 1098
1002static void 1099#if EV_PERIODICS
1100inline void
1003periodics_reify (EV_P) 1101periodics_reify (EV_P)
1004{ 1102{
1005 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1103 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1006 { 1104 {
1007 struct ev_periodic *w = periodics [0]; 1105 struct ev_periodic *w = periodics [0];
1009 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1107 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1010 1108
1011 /* first reschedule or stop timer */ 1109 /* first reschedule or stop timer */
1012 if (w->reschedule_cb) 1110 if (w->reschedule_cb)
1013 { 1111 {
1014 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1112 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1015
1016 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1113 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1017 downheap ((WT *)periodics, periodiccnt, 0); 1114 downheap ((WT *)periodics, periodiccnt, 0);
1018 } 1115 }
1019 else if (w->interval) 1116 else if (w->interval)
1020 { 1117 {
1047 1144
1048 /* now rebuild the heap */ 1145 /* now rebuild the heap */
1049 for (i = periodiccnt >> 1; i--; ) 1146 for (i = periodiccnt >> 1; i--; )
1050 downheap ((WT *)periodics, periodiccnt, i); 1147 downheap ((WT *)periodics, periodiccnt, i);
1051} 1148}
1149#endif
1052 1150
1053inline int 1151inline int
1054time_update_monotonic (EV_P) 1152time_update_monotonic (EV_P)
1055{ 1153{
1056 mn_now = get_clock (); 1154 mn_now = get_clock ();
1066 ev_rt_now = ev_time (); 1164 ev_rt_now = ev_time ();
1067 return 1; 1165 return 1;
1068 } 1166 }
1069} 1167}
1070 1168
1071static void 1169inline void
1072time_update (EV_P) 1170time_update (EV_P)
1073{ 1171{
1074 int i; 1172 int i;
1075 1173
1076#if EV_USE_MONOTONIC 1174#if EV_USE_MONOTONIC
1090 ev_rt_now = ev_time (); 1188 ev_rt_now = ev_time ();
1091 mn_now = get_clock (); 1189 mn_now = get_clock ();
1092 now_floor = mn_now; 1190 now_floor = mn_now;
1093 } 1191 }
1094 1192
1193# if EV_PERIODICS
1095 periodics_reschedule (EV_A); 1194 periodics_reschedule (EV_A);
1195# endif
1096 /* no timer adjustment, as the monotonic clock doesn't jump */ 1196 /* no timer adjustment, as the monotonic clock doesn't jump */
1097 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1197 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1098 } 1198 }
1099 } 1199 }
1100 else 1200 else
1102 { 1202 {
1103 ev_rt_now = ev_time (); 1203 ev_rt_now = ev_time ();
1104 1204
1105 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1205 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1106 { 1206 {
1207#if EV_PERIODICS
1107 periodics_reschedule (EV_A); 1208 periodics_reschedule (EV_A);
1209#endif
1108 1210
1109 /* adjust timers. this is easy, as the offset is the same for all */ 1211 /* adjust timers. this is easy, as the offset is the same for all */
1110 for (i = 0; i < timercnt; ++i) 1212 for (i = 0; i < timercnt; ++i)
1111 ((WT)timers [i])->at += ev_rt_now - mn_now; 1213 ((WT)timers [i])->at += ev_rt_now - mn_now;
1112 } 1214 }
1133ev_loop (EV_P_ int flags) 1235ev_loop (EV_P_ int flags)
1134{ 1236{
1135 double block; 1237 double block;
1136 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1238 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1137 1239
1138 do 1240 while (activecnt)
1139 { 1241 {
1140 /* queue check watchers (and execute them) */ 1242 /* queue check watchers (and execute them) */
1141 if (expect_false (preparecnt)) 1243 if (expect_false (preparecnt))
1142 { 1244 {
1143 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1245 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1171 { 1273 {
1172 block = MAX_BLOCKTIME; 1274 block = MAX_BLOCKTIME;
1173 1275
1174 if (timercnt) 1276 if (timercnt)
1175 { 1277 {
1176 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1278 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1177 if (block > to) block = to; 1279 if (block > to) block = to;
1178 } 1280 }
1179 1281
1282#if EV_PERIODICS
1180 if (periodiccnt) 1283 if (periodiccnt)
1181 { 1284 {
1182 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1285 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1183 if (block > to) block = to; 1286 if (block > to) block = to;
1184 } 1287 }
1288#endif
1185 1289
1186 if (block < 0.) block = 0.; 1290 if (expect_false (block < 0.)) block = 0.;
1187 } 1291 }
1188 1292
1189 method_poll (EV_A_ block); 1293 backend_poll (EV_A_ block);
1190 1294
1191 /* update ev_rt_now, do magic */ 1295 /* update ev_rt_now, do magic */
1192 time_update (EV_A); 1296 time_update (EV_A);
1193 1297
1194 /* queue pending timers and reschedule them */ 1298 /* queue pending timers and reschedule them */
1195 timers_reify (EV_A); /* relative timers called last */ 1299 timers_reify (EV_A); /* relative timers called last */
1300#if EV_PERIODICS
1196 periodics_reify (EV_A); /* absolute timers called first */ 1301 periodics_reify (EV_A); /* absolute timers called first */
1302#endif
1197 1303
1198 /* queue idle watchers unless io or timers are pending */ 1304 /* queue idle watchers unless io or timers are pending */
1199 if (idlecnt && !any_pending (EV_A)) 1305 if (idlecnt && !any_pending (EV_A))
1200 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1306 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1201 1307
1202 /* queue check watchers, to be executed first */ 1308 /* queue check watchers, to be executed first */
1203 if (checkcnt) 1309 if (expect_false (checkcnt))
1204 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1310 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1205 1311
1206 call_pending (EV_A); 1312 call_pending (EV_A);
1313
1314 if (expect_false (loop_done))
1315 break;
1207 } 1316 }
1208 while (activecnt && !loop_done);
1209 1317
1210 if (loop_done != 2) 1318 if (loop_done != 2)
1211 loop_done = 0; 1319 loop_done = 0;
1212} 1320}
1213 1321
1273void 1381void
1274ev_io_start (EV_P_ struct ev_io *w) 1382ev_io_start (EV_P_ struct ev_io *w)
1275{ 1383{
1276 int fd = w->fd; 1384 int fd = w->fd;
1277 1385
1278 if (ev_is_active (w)) 1386 if (expect_false (ev_is_active (w)))
1279 return; 1387 return;
1280 1388
1281 assert (("ev_io_start called with negative fd", fd >= 0)); 1389 assert (("ev_io_start called with negative fd", fd >= 0));
1282 1390
1283 ev_start (EV_A_ (W)w, 1); 1391 ev_start (EV_A_ (W)w, 1);
1289 1397
1290void 1398void
1291ev_io_stop (EV_P_ struct ev_io *w) 1399ev_io_stop (EV_P_ struct ev_io *w)
1292{ 1400{
1293 ev_clear_pending (EV_A_ (W)w); 1401 ev_clear_pending (EV_A_ (W)w);
1294 if (!ev_is_active (w)) 1402 if (expect_false (!ev_is_active (w)))
1295 return; 1403 return;
1296 1404
1297 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1405 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1298 1406
1299 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1407 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1303} 1411}
1304 1412
1305void 1413void
1306ev_timer_start (EV_P_ struct ev_timer *w) 1414ev_timer_start (EV_P_ struct ev_timer *w)
1307{ 1415{
1308 if (ev_is_active (w)) 1416 if (expect_false (ev_is_active (w)))
1309 return; 1417 return;
1310 1418
1311 ((WT)w)->at += mn_now; 1419 ((WT)w)->at += mn_now;
1312 1420
1313 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1421 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1314 1422
1315 ev_start (EV_A_ (W)w, ++timercnt); 1423 ev_start (EV_A_ (W)w, ++timercnt);
1316 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1424 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1317 timers [timercnt - 1] = w; 1425 timers [timercnt - 1] = w;
1318 upheap ((WT *)timers, timercnt - 1); 1426 upheap ((WT *)timers, timercnt - 1);
1319 1427
1320 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1428 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1321} 1429}
1322 1430
1323void 1431void
1324ev_timer_stop (EV_P_ struct ev_timer *w) 1432ev_timer_stop (EV_P_ struct ev_timer *w)
1325{ 1433{
1326 ev_clear_pending (EV_A_ (W)w); 1434 ev_clear_pending (EV_A_ (W)w);
1327 if (!ev_is_active (w)) 1435 if (expect_false (!ev_is_active (w)))
1328 return; 1436 return;
1329 1437
1330 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1438 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1331 1439
1332 if (((W)w)->active < timercnt--) 1440 if (expect_true (((W)w)->active < timercnt--))
1333 { 1441 {
1334 timers [((W)w)->active - 1] = timers [timercnt]; 1442 timers [((W)w)->active - 1] = timers [timercnt];
1335 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1443 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1336 } 1444 }
1337 1445
1338 ((WT)w)->at = w->repeat; 1446 ((WT)w)->at -= mn_now;
1339 1447
1340 ev_stop (EV_A_ (W)w); 1448 ev_stop (EV_A_ (W)w);
1341} 1449}
1342 1450
1343void 1451void
1344ev_timer_again (EV_P_ struct ev_timer *w) 1452ev_timer_again (EV_P_ struct ev_timer *w)
1345{ 1453{
1346 if (ev_is_active (w)) 1454 if (ev_is_active (w))
1347 { 1455 {
1348 if (w->repeat) 1456 if (w->repeat)
1457 {
1458 ((WT)w)->at = mn_now + w->repeat;
1349 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1459 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1460 }
1350 else 1461 else
1351 ev_timer_stop (EV_A_ w); 1462 ev_timer_stop (EV_A_ w);
1352 } 1463 }
1353 else if (w->repeat) 1464 else if (w->repeat)
1465 {
1466 w->at = w->repeat;
1354 ev_timer_start (EV_A_ w); 1467 ev_timer_start (EV_A_ w);
1468 }
1355} 1469}
1356 1470
1471#if EV_PERIODICS
1357void 1472void
1358ev_periodic_start (EV_P_ struct ev_periodic *w) 1473ev_periodic_start (EV_P_ struct ev_periodic *w)
1359{ 1474{
1360 if (ev_is_active (w)) 1475 if (expect_false (ev_is_active (w)))
1361 return; 1476 return;
1362 1477
1363 if (w->reschedule_cb) 1478 if (w->reschedule_cb)
1364 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1479 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1365 else if (w->interval) 1480 else if (w->interval)
1368 /* this formula differs from the one in periodic_reify because we do not always round up */ 1483 /* this formula differs from the one in periodic_reify because we do not always round up */
1369 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1484 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1370 } 1485 }
1371 1486
1372 ev_start (EV_A_ (W)w, ++periodiccnt); 1487 ev_start (EV_A_ (W)w, ++periodiccnt);
1373 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1488 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1374 periodics [periodiccnt - 1] = w; 1489 periodics [periodiccnt - 1] = w;
1375 upheap ((WT *)periodics, periodiccnt - 1); 1490 upheap ((WT *)periodics, periodiccnt - 1);
1376 1491
1377 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1492 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1378} 1493}
1379 1494
1380void 1495void
1381ev_periodic_stop (EV_P_ struct ev_periodic *w) 1496ev_periodic_stop (EV_P_ struct ev_periodic *w)
1382{ 1497{
1383 ev_clear_pending (EV_A_ (W)w); 1498 ev_clear_pending (EV_A_ (W)w);
1384 if (!ev_is_active (w)) 1499 if (expect_false (!ev_is_active (w)))
1385 return; 1500 return;
1386 1501
1387 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1502 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1388 1503
1389 if (((W)w)->active < periodiccnt--) 1504 if (expect_true (((W)w)->active < periodiccnt--))
1390 { 1505 {
1391 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1506 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1392 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1507 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1393 } 1508 }
1394 1509
1395 ev_stop (EV_A_ (W)w); 1510 ev_stop (EV_A_ (W)w);
1396} 1511}
1397 1512
1400{ 1515{
1401 /* TODO: use adjustheap and recalculation */ 1516 /* TODO: use adjustheap and recalculation */
1402 ev_periodic_stop (EV_A_ w); 1517 ev_periodic_stop (EV_A_ w);
1403 ev_periodic_start (EV_A_ w); 1518 ev_periodic_start (EV_A_ w);
1404} 1519}
1520#endif
1405 1521
1406void 1522void
1407ev_idle_start (EV_P_ struct ev_idle *w) 1523ev_idle_start (EV_P_ struct ev_idle *w)
1408{ 1524{
1409 if (ev_is_active (w)) 1525 if (expect_false (ev_is_active (w)))
1410 return; 1526 return;
1411 1527
1412 ev_start (EV_A_ (W)w, ++idlecnt); 1528 ev_start (EV_A_ (W)w, ++idlecnt);
1413 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1529 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1414 idles [idlecnt - 1] = w; 1530 idles [idlecnt - 1] = w;
1415} 1531}
1416 1532
1417void 1533void
1418ev_idle_stop (EV_P_ struct ev_idle *w) 1534ev_idle_stop (EV_P_ struct ev_idle *w)
1419{ 1535{
1420 ev_clear_pending (EV_A_ (W)w); 1536 ev_clear_pending (EV_A_ (W)w);
1421 if (ev_is_active (w)) 1537 if (expect_false (!ev_is_active (w)))
1422 return; 1538 return;
1423 1539
1424 idles [((W)w)->active - 1] = idles [--idlecnt]; 1540 idles [((W)w)->active - 1] = idles [--idlecnt];
1425 ev_stop (EV_A_ (W)w); 1541 ev_stop (EV_A_ (W)w);
1426} 1542}
1427 1543
1428void 1544void
1429ev_prepare_start (EV_P_ struct ev_prepare *w) 1545ev_prepare_start (EV_P_ struct ev_prepare *w)
1430{ 1546{
1431 if (ev_is_active (w)) 1547 if (expect_false (ev_is_active (w)))
1432 return; 1548 return;
1433 1549
1434 ev_start (EV_A_ (W)w, ++preparecnt); 1550 ev_start (EV_A_ (W)w, ++preparecnt);
1435 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1551 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1436 prepares [preparecnt - 1] = w; 1552 prepares [preparecnt - 1] = w;
1437} 1553}
1438 1554
1439void 1555void
1440ev_prepare_stop (EV_P_ struct ev_prepare *w) 1556ev_prepare_stop (EV_P_ struct ev_prepare *w)
1441{ 1557{
1442 ev_clear_pending (EV_A_ (W)w); 1558 ev_clear_pending (EV_A_ (W)w);
1443 if (ev_is_active (w)) 1559 if (expect_false (!ev_is_active (w)))
1444 return; 1560 return;
1445 1561
1446 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1562 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1447 ev_stop (EV_A_ (W)w); 1563 ev_stop (EV_A_ (W)w);
1448} 1564}
1449 1565
1450void 1566void
1451ev_check_start (EV_P_ struct ev_check *w) 1567ev_check_start (EV_P_ struct ev_check *w)
1452{ 1568{
1453 if (ev_is_active (w)) 1569 if (expect_false (ev_is_active (w)))
1454 return; 1570 return;
1455 1571
1456 ev_start (EV_A_ (W)w, ++checkcnt); 1572 ev_start (EV_A_ (W)w, ++checkcnt);
1457 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1573 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1458 checks [checkcnt - 1] = w; 1574 checks [checkcnt - 1] = w;
1459} 1575}
1460 1576
1461void 1577void
1462ev_check_stop (EV_P_ struct ev_check *w) 1578ev_check_stop (EV_P_ struct ev_check *w)
1463{ 1579{
1464 ev_clear_pending (EV_A_ (W)w); 1580 ev_clear_pending (EV_A_ (W)w);
1465 if (ev_is_active (w)) 1581 if (expect_false (!ev_is_active (w)))
1466 return; 1582 return;
1467 1583
1468 checks [((W)w)->active - 1] = checks [--checkcnt]; 1584 checks [((W)w)->active - 1] = checks [--checkcnt];
1469 ev_stop (EV_A_ (W)w); 1585 ev_stop (EV_A_ (W)w);
1470} 1586}
1475 1591
1476void 1592void
1477ev_signal_start (EV_P_ struct ev_signal *w) 1593ev_signal_start (EV_P_ struct ev_signal *w)
1478{ 1594{
1479#if EV_MULTIPLICITY 1595#if EV_MULTIPLICITY
1480 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1596 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1481#endif 1597#endif
1482 if (ev_is_active (w)) 1598 if (expect_false (ev_is_active (w)))
1483 return; 1599 return;
1484 1600
1485 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1601 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1486 1602
1487 ev_start (EV_A_ (W)w, 1); 1603 ev_start (EV_A_ (W)w, 1);
1488 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1604 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1489 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1605 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1490 1606
1491 if (!((WL)w)->next) 1607 if (!((WL)w)->next)
1492 { 1608 {
1493#if WIN32 1609#if _WIN32
1494 signal (w->signum, sighandler); 1610 signal (w->signum, sighandler);
1495#else 1611#else
1496 struct sigaction sa; 1612 struct sigaction sa;
1497 sa.sa_handler = sighandler; 1613 sa.sa_handler = sighandler;
1498 sigfillset (&sa.sa_mask); 1614 sigfillset (&sa.sa_mask);
1504 1620
1505void 1621void
1506ev_signal_stop (EV_P_ struct ev_signal *w) 1622ev_signal_stop (EV_P_ struct ev_signal *w)
1507{ 1623{
1508 ev_clear_pending (EV_A_ (W)w); 1624 ev_clear_pending (EV_A_ (W)w);
1509 if (!ev_is_active (w)) 1625 if (expect_false (!ev_is_active (w)))
1510 return; 1626 return;
1511 1627
1512 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1628 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1513 ev_stop (EV_A_ (W)w); 1629 ev_stop (EV_A_ (W)w);
1514 1630
1518 1634
1519void 1635void
1520ev_child_start (EV_P_ struct ev_child *w) 1636ev_child_start (EV_P_ struct ev_child *w)
1521{ 1637{
1522#if EV_MULTIPLICITY 1638#if EV_MULTIPLICITY
1523 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1639 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1524#endif 1640#endif
1525 if (ev_is_active (w)) 1641 if (expect_false (ev_is_active (w)))
1526 return; 1642 return;
1527 1643
1528 ev_start (EV_A_ (W)w, 1); 1644 ev_start (EV_A_ (W)w, 1);
1529 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1645 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1530} 1646}
1531 1647
1532void 1648void
1533ev_child_stop (EV_P_ struct ev_child *w) 1649ev_child_stop (EV_P_ struct ev_child *w)
1534{ 1650{
1535 ev_clear_pending (EV_A_ (W)w); 1651 ev_clear_pending (EV_A_ (W)w);
1536 if (ev_is_active (w)) 1652 if (expect_false (!ev_is_active (w)))
1537 return; 1653 return;
1538 1654
1539 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1655 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1540 ev_stop (EV_A_ (W)w); 1656 ev_stop (EV_A_ (W)w);
1541} 1657}
1578void 1694void
1579ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1695ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1580{ 1696{
1581 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1697 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1582 1698
1583 if (!once) 1699 if (expect_false (!once))
1700 {
1584 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1701 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1585 else 1702 return;
1586 { 1703 }
1704
1587 once->cb = cb; 1705 once->cb = cb;
1588 once->arg = arg; 1706 once->arg = arg;
1589 1707
1590 ev_init (&once->io, once_cb_io); 1708 ev_init (&once->io, once_cb_io);
1591 if (fd >= 0) 1709 if (fd >= 0)
1592 { 1710 {
1593 ev_io_set (&once->io, fd, events); 1711 ev_io_set (&once->io, fd, events);
1594 ev_io_start (EV_A_ &once->io); 1712 ev_io_start (EV_A_ &once->io);
1595 } 1713 }
1596 1714
1597 ev_init (&once->to, once_cb_to); 1715 ev_init (&once->to, once_cb_to);
1598 if (timeout >= 0.) 1716 if (timeout >= 0.)
1599 { 1717 {
1600 ev_timer_set (&once->to, timeout, 0.); 1718 ev_timer_set (&once->to, timeout, 0.);
1601 ev_timer_start (EV_A_ &once->to); 1719 ev_timer_start (EV_A_ &once->to);
1602 }
1603 } 1720 }
1604} 1721}
1605 1722
1606#ifdef __cplusplus 1723#ifdef __cplusplus
1607} 1724}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines