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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines