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

Comparing libev/ev.c (file contents):
Revision 1.83 by root, Fri Nov 9 21:48:23 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;
… …
221 284
222#if EV_MULTIPLICITY 285#if EV_MULTIPLICITY
223 286
224 struct ev_loop 287 struct ev_loop
225 { 288 {
289 ev_tstamp ev_rt_now;
290 #define ev_rt_now ((loop)->ev_rt_now)
226 #define VAR(name,decl) decl; 291 #define VAR(name,decl) decl;
227 #include "ev_vars.h" 292 #include "ev_vars.h"
228 #undef VAR 293 #undef VAR
229 }; 294 };
230 #include "ev_wrap.h" 295 #include "ev_wrap.h"
231 296
232 struct ev_loop default_loop_struct; 297 static struct ev_loop default_loop_struct;
233 static struct ev_loop *default_loop; 298 struct ev_loop *ev_default_loop_ptr;
234 299
235#else 300#else
236 301
302 ev_tstamp ev_rt_now;
237 #define VAR(name,decl) static decl; 303 #define VAR(name,decl) static decl;
238 #include "ev_vars.h" 304 #include "ev_vars.h"
239 #undef VAR 305 #undef VAR
240 306
241 static int default_loop; 307 static int ev_default_loop_ptr;
242 308
243#endif 309#endif
244 310
245/*****************************************************************************/ 311/*****************************************************************************/
246 312
247inline ev_tstamp 313ev_tstamp
248ev_time (void) 314ev_time (void)
249{ 315{
250#if EV_USE_REALTIME 316#if EV_USE_REALTIME
251 struct timespec ts; 317 struct timespec ts;
252 clock_gettime (CLOCK_REALTIME, &ts); 318 clock_gettime (CLOCK_REALTIME, &ts);
… …
271#endif 337#endif
272 338
273 return ev_time (); 339 return ev_time ();
274} 340}
275 341
342#if EV_MULTIPLICITY
276ev_tstamp 343ev_tstamp
277ev_now (EV_P) 344ev_now (EV_P)
278{ 345{
279 return rt_now; 346 return ev_rt_now;
280} 347}
348#endif
281 349
282#define array_roundsize(type,n) ((n) | 4 & ~3) 350#define array_roundsize(type,n) (((n) | 4) & ~3)
283 351
284#define array_needsize(type,base,cur,cnt,init) \ 352#define array_needsize(type,base,cur,cnt,init) \
285 if (expect_false ((cnt) > cur)) \ 353 if (expect_false ((cnt) > cur)) \
286 { \ 354 { \
287 int newcnt = cur; \ 355 int newcnt = cur; \
… …
302 stem ## max = array_roundsize (stem ## cnt >> 1); \ 370 stem ## max = array_roundsize (stem ## cnt >> 1); \
303 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 371 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
304 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 372 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
305 } 373 }
306 374
307/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
308/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
309#define array_free_microshit(stem) \
310 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
311
312#define array_free(stem, idx) \ 375#define array_free(stem, idx) \
313 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;
314 377
315/*****************************************************************************/ 378/*****************************************************************************/
316 379
… …
330void 393void
331ev_feed_event (EV_P_ void *w, int revents) 394ev_feed_event (EV_P_ void *w, int revents)
332{ 395{
333 W w_ = (W)w; 396 W w_ = (W)w;
334 397
335 if (w_->pending) 398 if (expect_false (w_->pending))
336 { 399 {
337 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 400 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
338 return; 401 return;
339 } 402 }
340 403
341 w_->pending = ++pendingcnt [ABSPRI (w_)]; 404 w_->pending = ++pendingcnt [ABSPRI (w_)];
342 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);
343 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 406 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
344 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 407 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
345} 408}
346 409
347static void 410static void
… …
374 fd_event (EV_A_ fd, revents); 437 fd_event (EV_A_ fd, revents);
375} 438}
376 439
377/*****************************************************************************/ 440/*****************************************************************************/
378 441
379static void 442inline void
380fd_reify (EV_P) 443fd_reify (EV_P)
381{ 444{
382 int i; 445 int i;
383 446
384 for (i = 0; i < fdchangecnt; ++i) 447 for (i = 0; i < fdchangecnt; ++i)
… …
390 int events = 0; 453 int events = 0;
391 454
392 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)
393 events |= w->events; 456 events |= w->events;
394 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
395 anfd->reify = 0; 467 anfd->reify = 0;
396 468
397 method_modify (EV_A_ fd, anfd->events, events); 469 method_modify (EV_A_ fd, anfd->events, events);
398 anfd->events = events; 470 anfd->events = events;
399 } 471 }
… …
402} 474}
403 475
404static void 476static void
405fd_change (EV_P_ int fd) 477fd_change (EV_P_ int fd)
406{ 478{
407 if (anfds [fd].reify) 479 if (expect_false (anfds [fd].reify))
408 return; 480 return;
409 481
410 anfds [fd].reify = 1; 482 anfds [fd].reify = 1;
411 483
412 ++fdchangecnt; 484 ++fdchangecnt;
413 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 485 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
414 fdchanges [fdchangecnt - 1] = fd; 486 fdchanges [fdchangecnt - 1] = fd;
415} 487}
416 488
417static void 489static void
418fd_kill (EV_P_ int fd) 490fd_kill (EV_P_ int fd)
… …
424 ev_io_stop (EV_A_ w); 496 ev_io_stop (EV_A_ w);
425 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);
426 } 498 }
427} 499}
428 500
429static int 501inline int
430fd_valid (int fd) 502fd_valid (int fd)
431{ 503{
432#ifdef WIN32 504#ifdef _WIN32
433 return !!win32_get_osfhandle (fd); 505 return _get_osfhandle (fd) != -1;
434#else 506#else
435 return fcntl (fd, F_GETFD) != -1; 507 return fcntl (fd, F_GETFD) != -1;
436#endif 508#endif
437} 509}
438 510
… …
518 590
519 heap [k] = w; 591 heap [k] = w;
520 ((W)heap [k])->active = k + 1; 592 ((W)heap [k])->active = k + 1;
521} 593}
522 594
595inline void
596adjustheap (WT *heap, int N, int k)
597{
598 upheap (heap, k);
599 downheap (heap, N, k);
600}
601
523/*****************************************************************************/ 602/*****************************************************************************/
524 603
525typedef struct 604typedef struct
526{ 605{
527 WL head; 606 WL head;
… …
548} 627}
549 628
550static void 629static void
551sighandler (int signum) 630sighandler (int signum)
552{ 631{
553#if WIN32 632#if _WIN32
554 signal (signum, sighandler); 633 signal (signum, sighandler);
555#endif 634#endif
556 635
557 signals [signum - 1].gotsig = 1; 636 signals [signum - 1].gotsig = 1;
558 637
559 if (!gotsig) 638 if (!gotsig)
560 { 639 {
561 int old_errno = errno; 640 int old_errno = errno;
562 gotsig = 1; 641 gotsig = 1;
563#ifdef WIN32
564 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
565#else
566 write (sigpipe [1], &signum, 1); 642 write (sigpipe [1], &signum, 1);
567#endif
568 errno = old_errno; 643 errno = old_errno;
569 } 644 }
570} 645}
571 646
572void 647void
573ev_feed_signal_event (EV_P_ int signum) 648ev_feed_signal_event (EV_P_ int signum)
574{ 649{
575 WL w; 650 WL w;
576 651
577#if EV_MULTIPLICITY 652#if EV_MULTIPLICITY
578 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));
579#endif 654#endif
580 655
581 --signum; 656 --signum;
582 657
583 if (signum < 0 || signum >= signalmax) 658 if (signum < 0 || signum >= signalmax)
… …
592static void 667static void
593sigcb (EV_P_ struct ev_io *iow, int revents) 668sigcb (EV_P_ struct ev_io *iow, int revents)
594{ 669{
595 int signum; 670 int signum;
596 671
597#ifdef WIN32
598 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
599#else
600 read (sigpipe [0], &revents, 1); 672 read (sigpipe [0], &revents, 1);
601#endif
602 gotsig = 0; 673 gotsig = 0;
603 674
604 for (signum = signalmax; signum--; ) 675 for (signum = signalmax; signum--; )
605 if (signals [signum].gotsig) 676 if (signals [signum].gotsig)
606 ev_feed_signal_event (EV_A_ signum + 1); 677 ev_feed_signal_event (EV_A_ signum + 1);
607} 678}
608 679
609static 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
610siginit (EV_P) 693siginit (EV_P)
611{ 694{
612#ifndef WIN32 695 fd_intern (sigpipe [0]);
613 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 696 fd_intern (sigpipe [1]);
614 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
615
616 /* rather than sort out wether we really need nb, set it */
617 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
618 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
619#endif
620 697
621 ev_io_set (&sigev, sigpipe [0], EV_READ); 698 ev_io_set (&sigev, sigpipe [0], EV_READ);
622 ev_io_start (EV_A_ &sigev); 699 ev_io_start (EV_A_ &sigev);
623 ev_unref (EV_A); /* child watcher should not keep loop alive */ 700 ev_unref (EV_A); /* child watcher should not keep loop alive */
624} 701}
625 702
626/*****************************************************************************/ 703/*****************************************************************************/
627 704
628static struct ev_child *childs [PID_HASHSIZE]; 705static struct ev_child *childs [PID_HASHSIZE];
629 706
630#ifndef WIN32 707#ifndef _WIN32
631 708
632static struct ev_signal childev; 709static struct ev_signal childev;
633 710
634#ifndef WCONTINUED 711#ifndef WCONTINUED
635# define WCONTINUED 0 712# define WCONTINUED 0
… …
667 744
668#endif 745#endif
669 746
670/*****************************************************************************/ 747/*****************************************************************************/
671 748
749#if EV_USE_PORT
750# include "ev_port.c"
751#endif
672#if EV_USE_KQUEUE 752#if EV_USE_KQUEUE
673# include "ev_kqueue.c" 753# include "ev_kqueue.c"
674#endif 754#endif
675#if EV_USE_EPOLL 755#if EV_USE_EPOLL
676# include "ev_epoll.c" 756# include "ev_epoll.c"
… …
696 776
697/* 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 */
698static int 778static int
699enable_secure (void) 779enable_secure (void)
700{ 780{
701#ifdef WIN32 781#ifdef _WIN32
702 return 0; 782 return 0;
703#else 783#else
704 return getuid () != geteuid () 784 return getuid () != geteuid ()
705 || getgid () != getegid (); 785 || getgid () != getegid ();
706#endif 786#endif
707} 787}
708 788
709int 789unsigned int
710ev_method (EV_P) 790ev_method (EV_P)
711{ 791{
712 return method; 792 return method;
713} 793}
714 794
715static void 795static void
716loop_init (EV_P_ int methods) 796loop_init (EV_P_ unsigned int flags)
717{ 797{
718 if (!method) 798 if (!method)
719 { 799 {
720#if EV_USE_MONOTONIC 800#if EV_USE_MONOTONIC
721 { 801 {
… …
723 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 803 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
724 have_monotonic = 1; 804 have_monotonic = 1;
725 } 805 }
726#endif 806#endif
727 807
728 rt_now = ev_time (); 808 ev_rt_now = ev_time ();
729 mn_now = get_clock (); 809 mn_now = get_clock ();
730 now_floor = mn_now; 810 now_floor = mn_now;
731 rtmn_diff = rt_now - mn_now; 811 rtmn_diff = ev_rt_now - mn_now;
732 812
733 if (methods == EVMETHOD_AUTO) 813 if (!(flags & EVFLAG_NOENV)
734 if (!enable_secure () && getenv ("LIBEV_METHODS")) 814 && !enable_secure ()
815 && getenv ("LIBEV_FLAGS"))
735 methods = atoi (getenv ("LIBEV_METHODS")); 816 flags = atoi (getenv ("LIBEV_FLAGS"));
817
818 if (!(flags & EVMETHOD_ALL))
736 else 819 {
737 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 }
738 827
739 method = 0; 828 method = 0;
740#if EV_USE_WIN32 829#if EV_USE_PORT
741 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 830 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
742#endif 831#endif
743#if EV_USE_KQUEUE 832#if EV_USE_KQUEUE
744 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 833 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
745#endif 834#endif
746#if EV_USE_EPOLL 835#if EV_USE_EPOLL
747 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 836 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
748#endif 837#endif
749#if EV_USE_POLL 838#if EV_USE_POLL
750 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 839 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
751#endif 840#endif
752#if EV_USE_SELECT 841#if EV_USE_SELECT
753 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 842 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
754#endif 843#endif
755 844
756 ev_init (&sigev, sigcb); 845 ev_init (&sigev, sigcb);
757 ev_set_priority (&sigev, EV_MAXPRI); 846 ev_set_priority (&sigev, EV_MAXPRI);
758 } 847 }
759} 848}
760 849
761void 850static void
762loop_destroy (EV_P) 851loop_destroy (EV_P)
763{ 852{
764 int i; 853 int i;
765 854
766#if EV_USE_WIN32 855#if EV_USE_PORT
767 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 856 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
768#endif 857#endif
769#if EV_USE_KQUEUE 858#if EV_USE_KQUEUE
770 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 859 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
771#endif 860#endif
772#if EV_USE_EPOLL 861#if EV_USE_EPOLL
… …
781 870
782 for (i = NUMPRI; i--; ) 871 for (i = NUMPRI; i--; )
783 array_free (pending, [i]); 872 array_free (pending, [i]);
784 873
785 /* have to use the microsoft-never-gets-it-right macro */ 874 /* have to use the microsoft-never-gets-it-right macro */
786 array_free_microshit (fdchange); 875 array_free (fdchange, EMPTY0);
787 array_free_microshit (timer); 876 array_free (timer, EMPTY0);
788 array_free_microshit (periodic); 877#if EV_PERIODICS
789 array_free_microshit (idle); 878 array_free (periodic, EMPTY0);
790 array_free_microshit (prepare); 879#endif
791 array_free_microshit (check); 880 array_free (idle, EMPTY0);
881 array_free (prepare, EMPTY0);
882 array_free (check, EMPTY0);
792 883
793 method = 0; 884 method = 0;
794} 885}
795 886
796static void 887static void
797loop_fork (EV_P) 888loop_fork (EV_P)
798{ 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
799#if EV_USE_EPOLL 896#if EV_USE_EPOLL
800 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 897 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
801#endif
802#if EV_USE_KQUEUE
803 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
804#endif 898#endif
805 899
806 if (ev_is_active (&sigev)) 900 if (ev_is_active (&sigev))
807 { 901 {
808 /* default loop */ 902 /* default loop */
… …
821 postfork = 0; 915 postfork = 0;
822} 916}
823 917
824#if EV_MULTIPLICITY 918#if EV_MULTIPLICITY
825struct ev_loop * 919struct ev_loop *
826ev_loop_new (int methods) 920ev_loop_new (unsigned int flags)
827{ 921{
828 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));
829 923
830 memset (loop, 0, sizeof (struct ev_loop)); 924 memset (loop, 0, sizeof (struct ev_loop));
831 925
832 loop_init (EV_A_ methods); 926 loop_init (EV_A_ flags);
833 927
834 if (ev_method (EV_A)) 928 if (ev_method (EV_A))
835 return loop; 929 return loop;
836 930
837 return 0; 931 return 0;
… …
852 946
853#endif 947#endif
854 948
855#if EV_MULTIPLICITY 949#if EV_MULTIPLICITY
856struct ev_loop * 950struct ev_loop *
951ev_default_loop_init (unsigned int flags)
857#else 952#else
858int 953int
954ev_default_loop (unsigned int flags)
859#endif 955#endif
860ev_default_loop (int methods)
861{ 956{
862 if (sigpipe [0] == sigpipe [1]) 957 if (sigpipe [0] == sigpipe [1])
863 if (pipe (sigpipe)) 958 if (pipe (sigpipe))
864 return 0; 959 return 0;
865 960
866 if (!default_loop) 961 if (!ev_default_loop_ptr)
867 { 962 {
868#if EV_MULTIPLICITY 963#if EV_MULTIPLICITY
869 struct ev_loop *loop = default_loop = &default_loop_struct; 964 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
870#else 965#else
871 default_loop = 1; 966 ev_default_loop_ptr = 1;
872#endif 967#endif
873 968
874 loop_init (EV_A_ methods); 969 loop_init (EV_A_ flags);
875 970
876 if (ev_method (EV_A)) 971 if (ev_method (EV_A))
877 { 972 {
878 siginit (EV_A); 973 siginit (EV_A);
879 974
880#ifndef WIN32 975#ifndef _WIN32
881 ev_signal_init (&childev, childcb, SIGCHLD); 976 ev_signal_init (&childev, childcb, SIGCHLD);
882 ev_set_priority (&childev, EV_MAXPRI); 977 ev_set_priority (&childev, EV_MAXPRI);
883 ev_signal_start (EV_A_ &childev); 978 ev_signal_start (EV_A_ &childev);
884 ev_unref (EV_A); /* child watcher should not keep loop alive */ 979 ev_unref (EV_A); /* child watcher should not keep loop alive */
885#endif 980#endif
886 } 981 }
887 else 982 else
888 default_loop = 0; 983 ev_default_loop_ptr = 0;
889 } 984 }
890 985
891 return default_loop; 986 return ev_default_loop_ptr;
892} 987}
893 988
894void 989void
895ev_default_destroy (void) 990ev_default_destroy (void)
896{ 991{
897#if EV_MULTIPLICITY 992#if EV_MULTIPLICITY
898 struct ev_loop *loop = default_loop; 993 struct ev_loop *loop = ev_default_loop_ptr;
899#endif 994#endif
900 995
901#ifndef WIN32 996#ifndef _WIN32
902 ev_ref (EV_A); /* child watcher */ 997 ev_ref (EV_A); /* child watcher */
903 ev_signal_stop (EV_A_ &childev); 998 ev_signal_stop (EV_A_ &childev);
904#endif 999#endif
905 1000
906 ev_ref (EV_A); /* signal watcher */ 1001 ev_ref (EV_A); /* signal watcher */
… …
914 1009
915void 1010void
916ev_default_fork (void) 1011ev_default_fork (void)
917{ 1012{
918#if EV_MULTIPLICITY 1013#if EV_MULTIPLICITY
919 struct ev_loop *loop = default_loop; 1014 struct ev_loop *loop = ev_default_loop_ptr;
920#endif 1015#endif
921 1016
922 if (method) 1017 if (method)
923 postfork = 1; 1018 postfork = 1;
924} 1019}
… …
935 return 1; 1030 return 1;
936 1031
937 return 0; 1032 return 0;
938} 1033}
939 1034
940static void 1035inline void
941call_pending (EV_P) 1036call_pending (EV_P)
942{ 1037{
943 int pri; 1038 int pri;
944 1039
945 for (pri = NUMPRI; pri--; ) 1040 for (pri = NUMPRI; pri--; )
946 while (pendingcnt [pri]) 1041 while (pendingcnt [pri])
947 { 1042 {
948 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1043 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
949 1044
950 if (p->w) 1045 if (expect_true (p->w))
951 { 1046 {
952 p->w->pending = 0; 1047 p->w->pending = 0;
953 EV_CB_INVOKE (p->w, p->events); 1048 EV_CB_INVOKE (p->w, p->events);
954 } 1049 }
955 } 1050 }
956} 1051}
957 1052
958static void 1053inline void
959timers_reify (EV_P) 1054timers_reify (EV_P)
960{ 1055{
961 while (timercnt && ((WT)timers [0])->at <= mn_now) 1056 while (timercnt && ((WT)timers [0])->at <= mn_now)
962 { 1057 {
963 struct ev_timer *w = timers [0]; 1058 struct ev_timer *w = timers [0];
… …
966 1061
967 /* first reschedule or stop timer */ 1062 /* first reschedule or stop timer */
968 if (w->repeat) 1063 if (w->repeat)
969 { 1064 {
970 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
971 ((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
972 downheap ((WT *)timers, timercnt, 0); 1071 downheap ((WT *)timers, timercnt, 0);
973 } 1072 }
974 else 1073 else
975 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1074 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
976 1075
977 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1076 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
978 } 1077 }
979} 1078}
980 1079
981static void 1080#if EV_PERIODICS
1081inline void
982periodics_reify (EV_P) 1082periodics_reify (EV_P)
983{ 1083{
984 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1084 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
985 { 1085 {
986 struct ev_periodic *w = periodics [0]; 1086 struct ev_periodic *w = periodics [0];
987 1087
988 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1088 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
989 1089
990 /* first reschedule or stop timer */ 1090 /* first reschedule or stop timer */
991 if (w->reschedule_cb) 1091 if (w->reschedule_cb)
992 { 1092 {
993 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1093 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
994
995 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1094 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
996 downheap ((WT *)periodics, periodiccnt, 0); 1095 downheap ((WT *)periodics, periodiccnt, 0);
997 } 1096 }
998 else if (w->interval) 1097 else if (w->interval)
999 { 1098 {
1000 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1099 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
1001 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1100 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1002 downheap ((WT *)periodics, periodiccnt, 0); 1101 downheap ((WT *)periodics, periodiccnt, 0);
1003 } 1102 }
1004 else 1103 else
1005 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1104 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1006 1105
… …
1017 for (i = 0; i < periodiccnt; ++i) 1116 for (i = 0; i < periodiccnt; ++i)
1018 { 1117 {
1019 struct ev_periodic *w = periodics [i]; 1118 struct ev_periodic *w = periodics [i];
1020 1119
1021 if (w->reschedule_cb) 1120 if (w->reschedule_cb)
1022 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1121 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1023 else if (w->interval) 1122 else if (w->interval)
1024 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1123 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1025 } 1124 }
1026 1125
1027 /* now rebuild the heap */ 1126 /* now rebuild the heap */
1028 for (i = periodiccnt >> 1; i--; ) 1127 for (i = periodiccnt >> 1; i--; )
1029 downheap ((WT *)periodics, periodiccnt, i); 1128 downheap ((WT *)periodics, periodiccnt, i);
1030} 1129}
1130#endif
1031 1131
1032inline int 1132inline int
1033time_update_monotonic (EV_P) 1133time_update_monotonic (EV_P)
1034{ 1134{
1035 mn_now = get_clock (); 1135 mn_now = get_clock ();
1036 1136
1037 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1137 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1038 { 1138 {
1039 rt_now = rtmn_diff + mn_now; 1139 ev_rt_now = rtmn_diff + mn_now;
1040 return 0; 1140 return 0;
1041 } 1141 }
1042 else 1142 else
1043 { 1143 {
1044 now_floor = mn_now; 1144 now_floor = mn_now;
1045 rt_now = ev_time (); 1145 ev_rt_now = ev_time ();
1046 return 1; 1146 return 1;
1047 } 1147 }
1048} 1148}
1049 1149
1050static void 1150inline void
1051time_update (EV_P) 1151time_update (EV_P)
1052{ 1152{
1053 int i; 1153 int i;
1054 1154
1055#if EV_USE_MONOTONIC 1155#if EV_USE_MONOTONIC
… …
1059 { 1159 {
1060 ev_tstamp odiff = rtmn_diff; 1160 ev_tstamp odiff = rtmn_diff;
1061 1161
1062 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1162 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1063 { 1163 {
1064 rtmn_diff = rt_now - mn_now; 1164 rtmn_diff = ev_rt_now - mn_now;
1065 1165
1066 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1166 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1067 return; /* all is well */ 1167 return; /* all is well */
1068 1168
1069 rt_now = ev_time (); 1169 ev_rt_now = ev_time ();
1070 mn_now = get_clock (); 1170 mn_now = get_clock ();
1071 now_floor = mn_now; 1171 now_floor = mn_now;
1072 } 1172 }
1073 1173
1174# if EV_PERIODICS
1074 periodics_reschedule (EV_A); 1175 periodics_reschedule (EV_A);
1176# endif
1075 /* no timer adjustment, as the monotonic clock doesn't jump */ 1177 /* no timer adjustment, as the monotonic clock doesn't jump */
1076 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1178 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1077 } 1179 }
1078 } 1180 }
1079 else 1181 else
1080#endif 1182#endif
1081 { 1183 {
1082 rt_now = ev_time (); 1184 ev_rt_now = ev_time ();
1083 1185
1084 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1186 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1085 { 1187 {
1188#if EV_PERIODICS
1086 periodics_reschedule (EV_A); 1189 periodics_reschedule (EV_A);
1190#endif
1087 1191
1088 /* 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 */
1089 for (i = 0; i < timercnt; ++i) 1193 for (i = 0; i < timercnt; ++i)
1090 ((WT)timers [i])->at += rt_now - mn_now; 1194 ((WT)timers [i])->at += ev_rt_now - mn_now;
1091 } 1195 }
1092 1196
1093 mn_now = rt_now; 1197 mn_now = ev_rt_now;
1094 } 1198 }
1095} 1199}
1096 1200
1097void 1201void
1098ev_ref (EV_P) 1202ev_ref (EV_P)
… …
1112ev_loop (EV_P_ int flags) 1216ev_loop (EV_P_ int flags)
1113{ 1217{
1114 double block; 1218 double block;
1115 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1219 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1116 1220
1117 do 1221 while (activecnt)
1118 { 1222 {
1119 /* queue check watchers (and execute them) */ 1223 /* queue check watchers (and execute them) */
1120 if (expect_false (preparecnt)) 1224 if (expect_false (preparecnt))
1121 { 1225 {
1122 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1226 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1138 if (expect_true (have_monotonic)) 1242 if (expect_true (have_monotonic))
1139 time_update_monotonic (EV_A); 1243 time_update_monotonic (EV_A);
1140 else 1244 else
1141#endif 1245#endif
1142 { 1246 {
1143 rt_now = ev_time (); 1247 ev_rt_now = ev_time ();
1144 mn_now = rt_now; 1248 mn_now = ev_rt_now;
1145 } 1249 }
1146 1250
1147 if (flags & EVLOOP_NONBLOCK || idlecnt) 1251 if (flags & EVLOOP_NONBLOCK || idlecnt)
1148 block = 0.; 1252 block = 0.;
1149 else 1253 else
… …
1154 { 1258 {
1155 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1259 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1156 if (block > to) block = to; 1260 if (block > to) block = to;
1157 } 1261 }
1158 1262
1263#if EV_PERIODICS
1159 if (periodiccnt) 1264 if (periodiccnt)
1160 { 1265 {
1161 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1266 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1162 if (block > to) block = to; 1267 if (block > to) block = to;
1163 } 1268 }
1269#endif
1164 1270
1165 if (block < 0.) block = 0.; 1271 if (expect_false (block < 0.)) block = 0.;
1166 } 1272 }
1167 1273
1168 method_poll (EV_A_ block); 1274 method_poll (EV_A_ block);
1169 1275
1170 /* update rt_now, do magic */ 1276 /* update ev_rt_now, do magic */
1171 time_update (EV_A); 1277 time_update (EV_A);
1172 1278
1173 /* queue pending timers and reschedule them */ 1279 /* queue pending timers and reschedule them */
1174 timers_reify (EV_A); /* relative timers called last */ 1280 timers_reify (EV_A); /* relative timers called last */
1281#if EV_PERIODICS
1175 periodics_reify (EV_A); /* absolute timers called first */ 1282 periodics_reify (EV_A); /* absolute timers called first */
1283#endif
1176 1284
1177 /* queue idle watchers unless io or timers are pending */ 1285 /* queue idle watchers unless io or timers are pending */
1178 if (idlecnt && !any_pending (EV_A)) 1286 if (idlecnt && !any_pending (EV_A))
1179 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1287 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1180 1288
1181 /* queue check watchers, to be executed first */ 1289 /* queue check watchers, to be executed first */
1182 if (checkcnt) 1290 if (expect_false (checkcnt))
1183 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1291 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1184 1292
1185 call_pending (EV_A); 1293 call_pending (EV_A);
1294
1295 if (expect_false (loop_done))
1296 break;
1186 } 1297 }
1187 while (activecnt && !loop_done);
1188 1298
1189 if (loop_done != 2) 1299 if (loop_done != 2)
1190 loop_done = 0; 1300 loop_done = 0;
1191} 1301}
1192 1302
… …
1252void 1362void
1253ev_io_start (EV_P_ struct ev_io *w) 1363ev_io_start (EV_P_ struct ev_io *w)
1254{ 1364{
1255 int fd = w->fd; 1365 int fd = w->fd;
1256 1366
1257 if (ev_is_active (w)) 1367 if (expect_false (ev_is_active (w)))
1258 return; 1368 return;
1259 1369
1260 assert (("ev_io_start called with negative fd", fd >= 0)); 1370 assert (("ev_io_start called with negative fd", fd >= 0));
1261 1371
1262 ev_start (EV_A_ (W)w, 1); 1372 ev_start (EV_A_ (W)w, 1);
… …
1268 1378
1269void 1379void
1270ev_io_stop (EV_P_ struct ev_io *w) 1380ev_io_stop (EV_P_ struct ev_io *w)
1271{ 1381{
1272 ev_clear_pending (EV_A_ (W)w); 1382 ev_clear_pending (EV_A_ (W)w);
1273 if (!ev_is_active (w)) 1383 if (expect_false (!ev_is_active (w)))
1274 return; 1384 return;
1385
1386 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1275 1387
1276 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1388 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1277 ev_stop (EV_A_ (W)w); 1389 ev_stop (EV_A_ (W)w);
1278 1390
1279 fd_change (EV_A_ w->fd); 1391 fd_change (EV_A_ w->fd);
1280} 1392}
1281 1393
1282void 1394void
1283ev_timer_start (EV_P_ struct ev_timer *w) 1395ev_timer_start (EV_P_ struct ev_timer *w)
1284{ 1396{
1285 if (ev_is_active (w)) 1397 if (expect_false (ev_is_active (w)))
1286 return; 1398 return;
1287 1399
1288 ((WT)w)->at += mn_now; 1400 ((WT)w)->at += mn_now;
1289 1401
1290 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.));
1291 1403
1292 ev_start (EV_A_ (W)w, ++timercnt); 1404 ev_start (EV_A_ (W)w, ++timercnt);
1293 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1405 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1294 timers [timercnt - 1] = w; 1406 timers [timercnt - 1] = w;
1295 upheap ((WT *)timers, timercnt - 1); 1407 upheap ((WT *)timers, timercnt - 1);
1296 1408
1297 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1409 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1298} 1410}
1299 1411
1300void 1412void
1301ev_timer_stop (EV_P_ struct ev_timer *w) 1413ev_timer_stop (EV_P_ struct ev_timer *w)
1302{ 1414{
1303 ev_clear_pending (EV_A_ (W)w); 1415 ev_clear_pending (EV_A_ (W)w);
1304 if (!ev_is_active (w)) 1416 if (expect_false (!ev_is_active (w)))
1305 return; 1417 return;
1306 1418
1307 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1419 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1308 1420
1309 if (((W)w)->active < timercnt--) 1421 if (expect_true (((W)w)->active < timercnt--))
1310 { 1422 {
1311 timers [((W)w)->active - 1] = timers [timercnt]; 1423 timers [((W)w)->active - 1] = timers [timercnt];
1312 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1424 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1313 } 1425 }
1314 1426
1315 ((WT)w)->at = w->repeat; 1427 ((WT)w)->at -= mn_now;
1316 1428
1317 ev_stop (EV_A_ (W)w); 1429 ev_stop (EV_A_ (W)w);
1318} 1430}
1319 1431
1320void 1432void
… …
1323 if (ev_is_active (w)) 1435 if (ev_is_active (w))
1324 { 1436 {
1325 if (w->repeat) 1437 if (w->repeat)
1326 { 1438 {
1327 ((WT)w)->at = mn_now + w->repeat; 1439 ((WT)w)->at = mn_now + w->repeat;
1328 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1440 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1329 } 1441 }
1330 else 1442 else
1331 ev_timer_stop (EV_A_ w); 1443 ev_timer_stop (EV_A_ w);
1332 } 1444 }
1333 else if (w->repeat) 1445 else if (w->repeat)
1446 {
1447 w->at = w->repeat;
1334 ev_timer_start (EV_A_ w); 1448 ev_timer_start (EV_A_ w);
1449 }
1335} 1450}
1336 1451
1452#if EV_PERIODICS
1337void 1453void
1338ev_periodic_start (EV_P_ struct ev_periodic *w) 1454ev_periodic_start (EV_P_ struct ev_periodic *w)
1339{ 1455{
1340 if (ev_is_active (w)) 1456 if (expect_false (ev_is_active (w)))
1341 return; 1457 return;
1342 1458
1343 if (w->reschedule_cb) 1459 if (w->reschedule_cb)
1344 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1460 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1345 else if (w->interval) 1461 else if (w->interval)
1346 { 1462 {
1347 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1463 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1348 /* 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 */
1349 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1465 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1350 } 1466 }
1351 1467
1352 ev_start (EV_A_ (W)w, ++periodiccnt); 1468 ev_start (EV_A_ (W)w, ++periodiccnt);
1353 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1469 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1354 periodics [periodiccnt - 1] = w; 1470 periodics [periodiccnt - 1] = w;
1355 upheap ((WT *)periodics, periodiccnt - 1); 1471 upheap ((WT *)periodics, periodiccnt - 1);
1356 1472
1357 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1473 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1358} 1474}
1359 1475
1360void 1476void
1361ev_periodic_stop (EV_P_ struct ev_periodic *w) 1477ev_periodic_stop (EV_P_ struct ev_periodic *w)
1362{ 1478{
1363 ev_clear_pending (EV_A_ (W)w); 1479 ev_clear_pending (EV_A_ (W)w);
1364 if (!ev_is_active (w)) 1480 if (expect_false (!ev_is_active (w)))
1365 return; 1481 return;
1366 1482
1367 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1483 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1368 1484
1369 if (((W)w)->active < periodiccnt--) 1485 if (expect_true (((W)w)->active < periodiccnt--))
1370 { 1486 {
1371 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1487 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1372 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1488 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1373 } 1489 }
1374 1490
1375 ev_stop (EV_A_ (W)w); 1491 ev_stop (EV_A_ (W)w);
1376} 1492}
1377 1493
1378void 1494void
1379ev_periodic_again (EV_P_ struct ev_periodic *w) 1495ev_periodic_again (EV_P_ struct ev_periodic *w)
1380{ 1496{
1497 /* TODO: use adjustheap and recalculation */
1381 ev_periodic_stop (EV_A_ w); 1498 ev_periodic_stop (EV_A_ w);
1382 ev_periodic_start (EV_A_ w); 1499 ev_periodic_start (EV_A_ w);
1383} 1500}
1501#endif
1384 1502
1385void 1503void
1386ev_idle_start (EV_P_ struct ev_idle *w) 1504ev_idle_start (EV_P_ struct ev_idle *w)
1387{ 1505{
1388 if (ev_is_active (w)) 1506 if (expect_false (ev_is_active (w)))
1389 return; 1507 return;
1390 1508
1391 ev_start (EV_A_ (W)w, ++idlecnt); 1509 ev_start (EV_A_ (W)w, ++idlecnt);
1392 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1510 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1393 idles [idlecnt - 1] = w; 1511 idles [idlecnt - 1] = w;
1394} 1512}
1395 1513
1396void 1514void
1397ev_idle_stop (EV_P_ struct ev_idle *w) 1515ev_idle_stop (EV_P_ struct ev_idle *w)
1398{ 1516{
1399 ev_clear_pending (EV_A_ (W)w); 1517 ev_clear_pending (EV_A_ (W)w);
1400 if (ev_is_active (w)) 1518 if (expect_false (!ev_is_active (w)))
1401 return; 1519 return;
1402 1520
1403 idles [((W)w)->active - 1] = idles [--idlecnt]; 1521 idles [((W)w)->active - 1] = idles [--idlecnt];
1404 ev_stop (EV_A_ (W)w); 1522 ev_stop (EV_A_ (W)w);
1405} 1523}
1406 1524
1407void 1525void
1408ev_prepare_start (EV_P_ struct ev_prepare *w) 1526ev_prepare_start (EV_P_ struct ev_prepare *w)
1409{ 1527{
1410 if (ev_is_active (w)) 1528 if (expect_false (ev_is_active (w)))
1411 return; 1529 return;
1412 1530
1413 ev_start (EV_A_ (W)w, ++preparecnt); 1531 ev_start (EV_A_ (W)w, ++preparecnt);
1414 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1532 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1415 prepares [preparecnt - 1] = w; 1533 prepares [preparecnt - 1] = w;
1416} 1534}
1417 1535
1418void 1536void
1419ev_prepare_stop (EV_P_ struct ev_prepare *w) 1537ev_prepare_stop (EV_P_ struct ev_prepare *w)
1420{ 1538{
1421 ev_clear_pending (EV_A_ (W)w); 1539 ev_clear_pending (EV_A_ (W)w);
1422 if (ev_is_active (w)) 1540 if (expect_false (!ev_is_active (w)))
1423 return; 1541 return;
1424 1542
1425 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1543 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1426 ev_stop (EV_A_ (W)w); 1544 ev_stop (EV_A_ (W)w);
1427} 1545}
1428 1546
1429void 1547void
1430ev_check_start (EV_P_ struct ev_check *w) 1548ev_check_start (EV_P_ struct ev_check *w)
1431{ 1549{
1432 if (ev_is_active (w)) 1550 if (expect_false (ev_is_active (w)))
1433 return; 1551 return;
1434 1552
1435 ev_start (EV_A_ (W)w, ++checkcnt); 1553 ev_start (EV_A_ (W)w, ++checkcnt);
1436 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1554 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1437 checks [checkcnt - 1] = w; 1555 checks [checkcnt - 1] = w;
1438} 1556}
1439 1557
1440void 1558void
1441ev_check_stop (EV_P_ struct ev_check *w) 1559ev_check_stop (EV_P_ struct ev_check *w)
1442{ 1560{
1443 ev_clear_pending (EV_A_ (W)w); 1561 ev_clear_pending (EV_A_ (W)w);
1444 if (ev_is_active (w)) 1562 if (expect_false (!ev_is_active (w)))
1445 return; 1563 return;
1446 1564
1447 checks [((W)w)->active - 1] = checks [--checkcnt]; 1565 checks [((W)w)->active - 1] = checks [--checkcnt];
1448 ev_stop (EV_A_ (W)w); 1566 ev_stop (EV_A_ (W)w);
1449} 1567}
… …
1454 1572
1455void 1573void
1456ev_signal_start (EV_P_ struct ev_signal *w) 1574ev_signal_start (EV_P_ struct ev_signal *w)
1457{ 1575{
1458#if EV_MULTIPLICITY 1576#if EV_MULTIPLICITY
1459 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));
1460#endif 1578#endif
1461 if (ev_is_active (w)) 1579 if (expect_false (ev_is_active (w)))
1462 return; 1580 return;
1463 1581
1464 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));
1465 1583
1466 ev_start (EV_A_ (W)w, 1); 1584 ev_start (EV_A_ (W)w, 1);
1467 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1585 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1468 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1586 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1469 1587
1470 if (!((WL)w)->next) 1588 if (!((WL)w)->next)
1471 { 1589 {
1472#if WIN32 1590#if _WIN32
1473 signal (w->signum, sighandler); 1591 signal (w->signum, sighandler);
1474#else 1592#else
1475 struct sigaction sa; 1593 struct sigaction sa;
1476 sa.sa_handler = sighandler; 1594 sa.sa_handler = sighandler;
1477 sigfillset (&sa.sa_mask); 1595 sigfillset (&sa.sa_mask);
… …
1483 1601
1484void 1602void
1485ev_signal_stop (EV_P_ struct ev_signal *w) 1603ev_signal_stop (EV_P_ struct ev_signal *w)
1486{ 1604{
1487 ev_clear_pending (EV_A_ (W)w); 1605 ev_clear_pending (EV_A_ (W)w);
1488 if (!ev_is_active (w)) 1606 if (expect_false (!ev_is_active (w)))
1489 return; 1607 return;
1490 1608
1491 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1609 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1492 ev_stop (EV_A_ (W)w); 1610 ev_stop (EV_A_ (W)w);
1493 1611
… …
1497 1615
1498void 1616void
1499ev_child_start (EV_P_ struct ev_child *w) 1617ev_child_start (EV_P_ struct ev_child *w)
1500{ 1618{
1501#if EV_MULTIPLICITY 1619#if EV_MULTIPLICITY
1502 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));
1503#endif 1621#endif
1504 if (ev_is_active (w)) 1622 if (expect_false (ev_is_active (w)))
1505 return; 1623 return;
1506 1624
1507 ev_start (EV_A_ (W)w, 1); 1625 ev_start (EV_A_ (W)w, 1);
1508 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1626 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1509} 1627}
1510 1628
1511void 1629void
1512ev_child_stop (EV_P_ struct ev_child *w) 1630ev_child_stop (EV_P_ struct ev_child *w)
1513{ 1631{
1514 ev_clear_pending (EV_A_ (W)w); 1632 ev_clear_pending (EV_A_ (W)w);
1515 if (ev_is_active (w)) 1633 if (expect_false (!ev_is_active (w)))
1516 return; 1634 return;
1517 1635
1518 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1636 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1519 ev_stop (EV_A_ (W)w); 1637 ev_stop (EV_A_ (W)w);
1520} 1638}
… …
1557void 1675void
1558ev_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)
1559{ 1677{
1560 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));
1561 1679
1562 if (!once) 1680 if (expect_false (!once))
1681 {
1563 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1682 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1564 else 1683 return;
1565 { 1684 }
1685
1566 once->cb = cb; 1686 once->cb = cb;
1567 once->arg = arg; 1687 once->arg = arg;
1568 1688
1569 ev_init (&once->io, once_cb_io); 1689 ev_init (&once->io, once_cb_io);
1570 if (fd >= 0) 1690 if (fd >= 0)
1571 { 1691 {
1572 ev_io_set (&once->io, fd, events); 1692 ev_io_set (&once->io, fd, events);
1573 ev_io_start (EV_A_ &once->io); 1693 ev_io_start (EV_A_ &once->io);
1574 } 1694 }
1575 1695
1576 ev_init (&once->to, once_cb_to); 1696 ev_init (&once->to, once_cb_to);
1577 if (timeout >= 0.) 1697 if (timeout >= 0.)
1578 { 1698 {
1579 ev_timer_set (&once->to, timeout, 0.); 1699 ev_timer_set (&once->to, timeout, 0.);
1580 ev_timer_start (EV_A_ &once->to); 1700 ev_timer_start (EV_A_ &once->to);
1581 }
1582 } 1701 }
1583} 1702}
1584 1703
1704#ifdef __cplusplus
1705}
1706#endif
1707

Diff Legend

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