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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines