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

Comparing libev/ev.c (file contents):
Revision 1.79 by root, Fri Nov 9 15:15:20 2007 UTC vs.
Revision 1.126 by root, Sun Nov 18 01:25:23 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines