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

Comparing libev/ev.c (file contents):
Revision 1.86 by root, Sat Nov 10 03:19:21 2007 UTC vs.
Revision 1.128 by root, Thu Nov 22 12:28:27 2007 UTC

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

Diff Legend

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