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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines