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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines