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.128 by root, Thu Nov 22 12:28:27 2007 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines