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

Comparing libev/ev.c (file contents):
Revision 1.84 by root, Fri Nov 9 23:04:35 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
131#ifdef EV_H 176#ifdef EV_H
132# include EV_H 177# include EV_H
133#else 178#else
134# include "ev.h" 179# include "ev.h"
135#endif 180#endif
136 181
137#if __GNUC__ >= 3 182#if __GNUC__ >= 3
138# define expect(expr,value) __builtin_expect ((expr),(value)) 183# define expect(expr,value) __builtin_expect ((expr),(value))
139# define inline inline 184# define inline static inline
140#else 185#else
141# define expect(expr,value) (expr) 186# define expect(expr,value) (expr)
142# define inline static 187# define inline static
143#endif 188#endif
144 189
146#define expect_true(expr) expect ((expr) != 0, 1) 191#define expect_true(expr) expect ((expr) != 0, 1)
147 192
148#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 193#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
149#define ABSPRI(w) ((w)->priority - EV_MINPRI) 194#define ABSPRI(w) ((w)->priority - EV_MINPRI)
150 195
196#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
197#define EMPTY2(a,b) /* used to suppress some warnings */
198
151typedef struct ev_watcher *W; 199typedef struct ev_watcher *W;
152typedef struct ev_watcher_list *WL; 200typedef struct ev_watcher_list *WL;
153typedef struct ev_watcher_time *WT; 201typedef struct ev_watcher_time *WT;
154 202
155static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 203static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
156 204
205#ifdef _WIN32
157#include "ev_win32.c" 206# include "ev_win32.c"
207#endif
158 208
159/*****************************************************************************/ 209/*****************************************************************************/
160 210
161static void (*syserr_cb)(const char *msg); 211static void (*syserr_cb)(const char *msg);
162 212
209typedef struct 259typedef struct
210{ 260{
211 WL head; 261 WL head;
212 unsigned char events; 262 unsigned char events;
213 unsigned char reify; 263 unsigned char reify;
264#if EV_SELECT_IS_WINSOCKET
265 SOCKET handle;
266#endif
214} ANFD; 267} ANFD;
215 268
216typedef struct 269typedef struct
217{ 270{
218 W w; 271 W w;
221 274
222#if EV_MULTIPLICITY 275#if EV_MULTIPLICITY
223 276
224 struct ev_loop 277 struct ev_loop
225 { 278 {
279 ev_tstamp ev_rt_now;
280 #define ev_rt_now ((loop)->ev_rt_now)
226 #define VAR(name,decl) decl; 281 #define VAR(name,decl) decl;
227 #include "ev_vars.h" 282 #include "ev_vars.h"
228 #undef VAR 283 #undef VAR
229 }; 284 };
230 #include "ev_wrap.h" 285 #include "ev_wrap.h"
231 286
232 struct ev_loop default_loop_struct; 287 static struct ev_loop default_loop_struct;
233 static struct ev_loop *default_loop; 288 struct ev_loop *ev_default_loop_ptr;
234 289
235#else 290#else
236 291
292 ev_tstamp ev_rt_now;
237 #define VAR(name,decl) static decl; 293 #define VAR(name,decl) static decl;
238 #include "ev_vars.h" 294 #include "ev_vars.h"
239 #undef VAR 295 #undef VAR
240 296
241 static int default_loop; 297 static int ev_default_loop_ptr;
242 298
243#endif 299#endif
244 300
245/*****************************************************************************/ 301/*****************************************************************************/
246 302
247inline ev_tstamp 303ev_tstamp
248ev_time (void) 304ev_time (void)
249{ 305{
250#if EV_USE_REALTIME 306#if EV_USE_REALTIME
251 struct timespec ts; 307 struct timespec ts;
252 clock_gettime (CLOCK_REALTIME, &ts); 308 clock_gettime (CLOCK_REALTIME, &ts);
271#endif 327#endif
272 328
273 return ev_time (); 329 return ev_time ();
274} 330}
275 331
332#if EV_MULTIPLICITY
276ev_tstamp 333ev_tstamp
277ev_now (EV_P) 334ev_now (EV_P)
278{ 335{
279 return rt_now; 336 return ev_rt_now;
280} 337}
338#endif
281 339
282#define array_roundsize(type,n) ((n) | 4 & ~3) 340#define array_roundsize(type,n) (((n) | 4) & ~3)
283 341
284#define array_needsize(type,base,cur,cnt,init) \ 342#define array_needsize(type,base,cur,cnt,init) \
285 if (expect_false ((cnt) > cur)) \ 343 if (expect_false ((cnt) > cur)) \
286 { \ 344 { \
287 int newcnt = cur; \ 345 int newcnt = cur; \
302 stem ## max = array_roundsize (stem ## cnt >> 1); \ 360 stem ## max = array_roundsize (stem ## cnt >> 1); \
303 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 361 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
304 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 362 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
305 } 363 }
306 364
307/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
308/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
309#define array_free_microshit(stem) \
310 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
311
312#define array_free(stem, idx) \ 365#define array_free(stem, idx) \
313 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;
314 367
315/*****************************************************************************/ 368/*****************************************************************************/
316 369
330void 383void
331ev_feed_event (EV_P_ void *w, int revents) 384ev_feed_event (EV_P_ void *w, int revents)
332{ 385{
333 W w_ = (W)w; 386 W w_ = (W)w;
334 387
335 if (w_->pending) 388 if (expect_false (w_->pending))
336 { 389 {
337 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 390 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
338 return; 391 return;
339 } 392 }
340 393
341 w_->pending = ++pendingcnt [ABSPRI (w_)]; 394 w_->pending = ++pendingcnt [ABSPRI (w_)];
342 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);
343 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 396 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
344 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 397 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
345} 398}
346 399
347static void 400static void
374 fd_event (EV_A_ fd, revents); 427 fd_event (EV_A_ fd, revents);
375} 428}
376 429
377/*****************************************************************************/ 430/*****************************************************************************/
378 431
379static void 432inline void
380fd_reify (EV_P) 433fd_reify (EV_P)
381{ 434{
382 int i; 435 int i;
383 436
384 for (i = 0; i < fdchangecnt; ++i) 437 for (i = 0; i < fdchangecnt; ++i)
390 int events = 0; 443 int events = 0;
391 444
392 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)
393 events |= w->events; 446 events |= w->events;
394 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
395 anfd->reify = 0; 457 anfd->reify = 0;
396 458
397 method_modify (EV_A_ fd, anfd->events, events); 459 method_modify (EV_A_ fd, anfd->events, events);
398 anfd->events = events; 460 anfd->events = events;
399 } 461 }
402} 464}
403 465
404static void 466static void
405fd_change (EV_P_ int fd) 467fd_change (EV_P_ int fd)
406{ 468{
407 if (anfds [fd].reify) 469 if (expect_false (anfds [fd].reify))
408 return; 470 return;
409 471
410 anfds [fd].reify = 1; 472 anfds [fd].reify = 1;
411 473
412 ++fdchangecnt; 474 ++fdchangecnt;
413 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 475 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
414 fdchanges [fdchangecnt - 1] = fd; 476 fdchanges [fdchangecnt - 1] = fd;
415} 477}
416 478
417static void 479static void
418fd_kill (EV_P_ int fd) 480fd_kill (EV_P_ int fd)
424 ev_io_stop (EV_A_ w); 486 ev_io_stop (EV_A_ w);
425 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);
426 } 488 }
427} 489}
428 490
429static int 491inline int
430fd_valid (int fd) 492fd_valid (int fd)
431{ 493{
432#ifdef WIN32 494#ifdef _WIN32
433 return !!win32_get_osfhandle (fd); 495 return _get_osfhandle (fd) != -1;
434#else 496#else
435 return fcntl (fd, F_GETFD) != -1; 497 return fcntl (fd, F_GETFD) != -1;
436#endif 498#endif
437} 499}
438 500
519 heap [k] = w; 581 heap [k] = w;
520 ((W)heap [k])->active = k + 1; 582 ((W)heap [k])->active = k + 1;
521} 583}
522 584
523inline void 585inline void
524adjustheap (WT *heap, int N, int k, ev_tstamp at) 586adjustheap (WT *heap, int N, int k)
525{ 587{
526 ev_tstamp old_at = heap [k]->at; 588 upheap (heap, k);
527 heap [k]->at = at;
528
529 if (old_at < at)
530 downheap (heap, N, k); 589 downheap (heap, N, k);
531 else
532 upheap (heap, k);
533} 590}
534 591
535/*****************************************************************************/ 592/*****************************************************************************/
536 593
537typedef struct 594typedef struct
560} 617}
561 618
562static void 619static void
563sighandler (int signum) 620sighandler (int signum)
564{ 621{
565#if WIN32 622#if _WIN32
566 signal (signum, sighandler); 623 signal (signum, sighandler);
567#endif 624#endif
568 625
569 signals [signum - 1].gotsig = 1; 626 signals [signum - 1].gotsig = 1;
570 627
571 if (!gotsig) 628 if (!gotsig)
572 { 629 {
573 int old_errno = errno; 630 int old_errno = errno;
574 gotsig = 1; 631 gotsig = 1;
575#ifdef WIN32
576 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
577#else
578 write (sigpipe [1], &signum, 1); 632 write (sigpipe [1], &signum, 1);
579#endif
580 errno = old_errno; 633 errno = old_errno;
581 } 634 }
582} 635}
583 636
584void 637void
585ev_feed_signal_event (EV_P_ int signum) 638ev_feed_signal_event (EV_P_ int signum)
586{ 639{
587 WL w; 640 WL w;
588 641
589#if EV_MULTIPLICITY 642#if EV_MULTIPLICITY
590 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));
591#endif 644#endif
592 645
593 --signum; 646 --signum;
594 647
595 if (signum < 0 || signum >= signalmax) 648 if (signum < 0 || signum >= signalmax)
604static void 657static void
605sigcb (EV_P_ struct ev_io *iow, int revents) 658sigcb (EV_P_ struct ev_io *iow, int revents)
606{ 659{
607 int signum; 660 int signum;
608 661
609#ifdef WIN32
610 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
611#else
612 read (sigpipe [0], &revents, 1); 662 read (sigpipe [0], &revents, 1);
613#endif
614 gotsig = 0; 663 gotsig = 0;
615 664
616 for (signum = signalmax; signum--; ) 665 for (signum = signalmax; signum--; )
617 if (signals [signum].gotsig) 666 if (signals [signum].gotsig)
618 ev_feed_signal_event (EV_A_ signum + 1); 667 ev_feed_signal_event (EV_A_ signum + 1);
619} 668}
620 669
621static void 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
680}
681
682static void
622siginit (EV_P) 683siginit (EV_P)
623{ 684{
624#ifndef WIN32 685 fd_intern (sigpipe [0]);
625 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 686 fd_intern (sigpipe [1]);
626 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
627
628 /* rather than sort out wether we really need nb, set it */
629 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
630 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
631#endif
632 687
633 ev_io_set (&sigev, sigpipe [0], EV_READ); 688 ev_io_set (&sigev, sigpipe [0], EV_READ);
634 ev_io_start (EV_A_ &sigev); 689 ev_io_start (EV_A_ &sigev);
635 ev_unref (EV_A); /* child watcher should not keep loop alive */ 690 ev_unref (EV_A); /* child watcher should not keep loop alive */
636} 691}
637 692
638/*****************************************************************************/ 693/*****************************************************************************/
639 694
640static struct ev_child *childs [PID_HASHSIZE]; 695static struct ev_child *childs [PID_HASHSIZE];
641 696
642#ifndef WIN32 697#ifndef _WIN32
643 698
644static struct ev_signal childev; 699static struct ev_signal childev;
645 700
646#ifndef WCONTINUED 701#ifndef WCONTINUED
647# define WCONTINUED 0 702# define WCONTINUED 0
679 734
680#endif 735#endif
681 736
682/*****************************************************************************/ 737/*****************************************************************************/
683 738
739#if EV_USE_PORT
740# include "ev_port.c"
741#endif
684#if EV_USE_KQUEUE 742#if EV_USE_KQUEUE
685# include "ev_kqueue.c" 743# include "ev_kqueue.c"
686#endif 744#endif
687#if EV_USE_EPOLL 745#if EV_USE_EPOLL
688# include "ev_epoll.c" 746# include "ev_epoll.c"
708 766
709/* 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 */
710static int 768static int
711enable_secure (void) 769enable_secure (void)
712{ 770{
713#ifdef WIN32 771#ifdef _WIN32
714 return 0; 772 return 0;
715#else 773#else
716 return getuid () != geteuid () 774 return getuid () != geteuid ()
717 || getgid () != getegid (); 775 || getgid () != getegid ();
718#endif 776#endif
719} 777}
720 778
721int 779unsigned int
722ev_method (EV_P) 780ev_method (EV_P)
723{ 781{
724 return method; 782 return method;
725} 783}
726 784
727static void 785static void
728loop_init (EV_P_ int methods) 786loop_init (EV_P_ unsigned int flags)
729{ 787{
730 if (!method) 788 if (!method)
731 { 789 {
732#if EV_USE_MONOTONIC 790#if EV_USE_MONOTONIC
733 { 791 {
735 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 793 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
736 have_monotonic = 1; 794 have_monotonic = 1;
737 } 795 }
738#endif 796#endif
739 797
740 rt_now = ev_time (); 798 ev_rt_now = ev_time ();
741 mn_now = get_clock (); 799 mn_now = get_clock ();
742 now_floor = mn_now; 800 now_floor = mn_now;
743 rtmn_diff = rt_now - mn_now; 801 rtmn_diff = ev_rt_now - mn_now;
744 802
745 if (methods == EVMETHOD_AUTO) 803 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
746 if (!enable_secure () && getenv ("LIBEV_METHODS"))
747 methods = atoi (getenv ("LIBEV_METHODS")); 804 flags = atoi (getenv ("LIBEV_FLAGS"));
748 else 805
749 methods = EVMETHOD_ANY; 806 if (!(flags & 0x0000ffff))
807 flags |= 0x0000ffff;
750 808
751 method = 0; 809 method = 0;
752#if EV_USE_WIN32 810#if EV_USE_PORT
753 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 811 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
754#endif 812#endif
755#if EV_USE_KQUEUE 813#if EV_USE_KQUEUE
756 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 814 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
757#endif 815#endif
758#if EV_USE_EPOLL 816#if EV_USE_EPOLL
759 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 817 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
760#endif 818#endif
761#if EV_USE_POLL 819#if EV_USE_POLL
762 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 820 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
763#endif 821#endif
764#if EV_USE_SELECT 822#if EV_USE_SELECT
765 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 823 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
766#endif 824#endif
767 825
768 ev_init (&sigev, sigcb); 826 ev_init (&sigev, sigcb);
769 ev_set_priority (&sigev, EV_MAXPRI); 827 ev_set_priority (&sigev, EV_MAXPRI);
770 } 828 }
771} 829}
772 830
773void 831static void
774loop_destroy (EV_P) 832loop_destroy (EV_P)
775{ 833{
776 int i; 834 int i;
777 835
778#if EV_USE_WIN32 836#if EV_USE_PORT
779 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 837 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
780#endif 838#endif
781#if EV_USE_KQUEUE 839#if EV_USE_KQUEUE
782 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 840 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
783#endif 841#endif
784#if EV_USE_EPOLL 842#if EV_USE_EPOLL
793 851
794 for (i = NUMPRI; i--; ) 852 for (i = NUMPRI; i--; )
795 array_free (pending, [i]); 853 array_free (pending, [i]);
796 854
797 /* have to use the microsoft-never-gets-it-right macro */ 855 /* have to use the microsoft-never-gets-it-right macro */
798 array_free_microshit (fdchange); 856 array_free (fdchange, EMPTY0);
799 array_free_microshit (timer); 857 array_free (timer, EMPTY0);
800 array_free_microshit (periodic); 858#if EV_PERIODICS
801 array_free_microshit (idle); 859 array_free (periodic, EMPTY0);
802 array_free_microshit (prepare); 860#endif
803 array_free_microshit (check); 861 array_free (idle, EMPTY0);
862 array_free (prepare, EMPTY0);
863 array_free (check, EMPTY0);
804 864
805 method = 0; 865 method = 0;
806} 866}
807 867
808static void 868static void
809loop_fork (EV_P) 869loop_fork (EV_P)
810{ 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
811#if EV_USE_EPOLL 877#if EV_USE_EPOLL
812 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 878 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
813#endif
814#if EV_USE_KQUEUE
815 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
816#endif 879#endif
817 880
818 if (ev_is_active (&sigev)) 881 if (ev_is_active (&sigev))
819 { 882 {
820 /* default loop */ 883 /* default loop */
833 postfork = 0; 896 postfork = 0;
834} 897}
835 898
836#if EV_MULTIPLICITY 899#if EV_MULTIPLICITY
837struct ev_loop * 900struct ev_loop *
838ev_loop_new (int methods) 901ev_loop_new (unsigned int flags)
839{ 902{
840 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));
841 904
842 memset (loop, 0, sizeof (struct ev_loop)); 905 memset (loop, 0, sizeof (struct ev_loop));
843 906
844 loop_init (EV_A_ methods); 907 loop_init (EV_A_ flags);
845 908
846 if (ev_method (EV_A)) 909 if (ev_method (EV_A))
847 return loop; 910 return loop;
848 911
849 return 0; 912 return 0;
864 927
865#endif 928#endif
866 929
867#if EV_MULTIPLICITY 930#if EV_MULTIPLICITY
868struct ev_loop * 931struct ev_loop *
932ev_default_loop_init (unsigned int flags)
869#else 933#else
870int 934int
935ev_default_loop (unsigned int flags)
871#endif 936#endif
872ev_default_loop (int methods)
873{ 937{
874 if (sigpipe [0] == sigpipe [1]) 938 if (sigpipe [0] == sigpipe [1])
875 if (pipe (sigpipe)) 939 if (pipe (sigpipe))
876 return 0; 940 return 0;
877 941
878 if (!default_loop) 942 if (!ev_default_loop_ptr)
879 { 943 {
880#if EV_MULTIPLICITY 944#if EV_MULTIPLICITY
881 struct ev_loop *loop = default_loop = &default_loop_struct; 945 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
882#else 946#else
883 default_loop = 1; 947 ev_default_loop_ptr = 1;
884#endif 948#endif
885 949
886 loop_init (EV_A_ methods); 950 loop_init (EV_A_ flags);
887 951
888 if (ev_method (EV_A)) 952 if (ev_method (EV_A))
889 { 953 {
890 siginit (EV_A); 954 siginit (EV_A);
891 955
892#ifndef WIN32 956#ifndef _WIN32
893 ev_signal_init (&childev, childcb, SIGCHLD); 957 ev_signal_init (&childev, childcb, SIGCHLD);
894 ev_set_priority (&childev, EV_MAXPRI); 958 ev_set_priority (&childev, EV_MAXPRI);
895 ev_signal_start (EV_A_ &childev); 959 ev_signal_start (EV_A_ &childev);
896 ev_unref (EV_A); /* child watcher should not keep loop alive */ 960 ev_unref (EV_A); /* child watcher should not keep loop alive */
897#endif 961#endif
898 } 962 }
899 else 963 else
900 default_loop = 0; 964 ev_default_loop_ptr = 0;
901 } 965 }
902 966
903 return default_loop; 967 return ev_default_loop_ptr;
904} 968}
905 969
906void 970void
907ev_default_destroy (void) 971ev_default_destroy (void)
908{ 972{
909#if EV_MULTIPLICITY 973#if EV_MULTIPLICITY
910 struct ev_loop *loop = default_loop; 974 struct ev_loop *loop = ev_default_loop_ptr;
911#endif 975#endif
912 976
913#ifndef WIN32 977#ifndef _WIN32
914 ev_ref (EV_A); /* child watcher */ 978 ev_ref (EV_A); /* child watcher */
915 ev_signal_stop (EV_A_ &childev); 979 ev_signal_stop (EV_A_ &childev);
916#endif 980#endif
917 981
918 ev_ref (EV_A); /* signal watcher */ 982 ev_ref (EV_A); /* signal watcher */
926 990
927void 991void
928ev_default_fork (void) 992ev_default_fork (void)
929{ 993{
930#if EV_MULTIPLICITY 994#if EV_MULTIPLICITY
931 struct ev_loop *loop = default_loop; 995 struct ev_loop *loop = ev_default_loop_ptr;
932#endif 996#endif
933 997
934 if (method) 998 if (method)
935 postfork = 1; 999 postfork = 1;
936} 1000}
947 return 1; 1011 return 1;
948 1012
949 return 0; 1013 return 0;
950} 1014}
951 1015
952static void 1016inline void
953call_pending (EV_P) 1017call_pending (EV_P)
954{ 1018{
955 int pri; 1019 int pri;
956 1020
957 for (pri = NUMPRI; pri--; ) 1021 for (pri = NUMPRI; pri--; )
958 while (pendingcnt [pri]) 1022 while (pendingcnt [pri])
959 { 1023 {
960 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1024 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
961 1025
962 if (p->w) 1026 if (expect_true (p->w))
963 { 1027 {
964 p->w->pending = 0; 1028 p->w->pending = 0;
965 EV_CB_INVOKE (p->w, p->events); 1029 EV_CB_INVOKE (p->w, p->events);
966 } 1030 }
967 } 1031 }
968} 1032}
969 1033
970static void 1034inline void
971timers_reify (EV_P) 1035timers_reify (EV_P)
972{ 1036{
973 while (timercnt && ((WT)timers [0])->at <= mn_now) 1037 while (timercnt && ((WT)timers [0])->at <= mn_now)
974 { 1038 {
975 struct ev_timer *w = timers [0]; 1039 struct ev_timer *w = timers [0];
978 1042
979 /* first reschedule or stop timer */ 1043 /* first reschedule or stop timer */
980 if (w->repeat) 1044 if (w->repeat)
981 { 1045 {
982 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
983 ((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
984 downheap ((WT *)timers, timercnt, 0); 1052 downheap ((WT *)timers, timercnt, 0);
985 } 1053 }
986 else 1054 else
987 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1055 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
988 1056
989 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1057 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
990 } 1058 }
991} 1059}
992 1060
993static void 1061#if EV_PERIODICS
1062inline void
994periodics_reify (EV_P) 1063periodics_reify (EV_P)
995{ 1064{
996 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1065 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
997 { 1066 {
998 struct ev_periodic *w = periodics [0]; 1067 struct ev_periodic *w = periodics [0];
999 1068
1000 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1069 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1001 1070
1002 /* first reschedule or stop timer */ 1071 /* first reschedule or stop timer */
1003 if (w->reschedule_cb) 1072 if (w->reschedule_cb)
1004 { 1073 {
1005 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);
1006
1007 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));
1008 downheap ((WT *)periodics, periodiccnt, 0); 1076 downheap ((WT *)periodics, periodiccnt, 0);
1009 } 1077 }
1010 else if (w->interval) 1078 else if (w->interval)
1011 { 1079 {
1012 ((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;
1013 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));
1014 downheap ((WT *)periodics, periodiccnt, 0); 1082 downheap ((WT *)periodics, periodiccnt, 0);
1015 } 1083 }
1016 else 1084 else
1017 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1085 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1018 1086
1029 for (i = 0; i < periodiccnt; ++i) 1097 for (i = 0; i < periodiccnt; ++i)
1030 { 1098 {
1031 struct ev_periodic *w = periodics [i]; 1099 struct ev_periodic *w = periodics [i];
1032 1100
1033 if (w->reschedule_cb) 1101 if (w->reschedule_cb)
1034 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1102 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1035 else if (w->interval) 1103 else if (w->interval)
1036 ((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;
1037 } 1105 }
1038 1106
1039 /* now rebuild the heap */ 1107 /* now rebuild the heap */
1040 for (i = periodiccnt >> 1; i--; ) 1108 for (i = periodiccnt >> 1; i--; )
1041 downheap ((WT *)periodics, periodiccnt, i); 1109 downheap ((WT *)periodics, periodiccnt, i);
1042} 1110}
1111#endif
1043 1112
1044inline int 1113inline int
1045time_update_monotonic (EV_P) 1114time_update_monotonic (EV_P)
1046{ 1115{
1047 mn_now = get_clock (); 1116 mn_now = get_clock ();
1048 1117
1049 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1118 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1050 { 1119 {
1051 rt_now = rtmn_diff + mn_now; 1120 ev_rt_now = rtmn_diff + mn_now;
1052 return 0; 1121 return 0;
1053 } 1122 }
1054 else 1123 else
1055 { 1124 {
1056 now_floor = mn_now; 1125 now_floor = mn_now;
1057 rt_now = ev_time (); 1126 ev_rt_now = ev_time ();
1058 return 1; 1127 return 1;
1059 } 1128 }
1060} 1129}
1061 1130
1062static void 1131inline void
1063time_update (EV_P) 1132time_update (EV_P)
1064{ 1133{
1065 int i; 1134 int i;
1066 1135
1067#if EV_USE_MONOTONIC 1136#if EV_USE_MONOTONIC
1071 { 1140 {
1072 ev_tstamp odiff = rtmn_diff; 1141 ev_tstamp odiff = rtmn_diff;
1073 1142
1074 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 */
1075 { 1144 {
1076 rtmn_diff = rt_now - mn_now; 1145 rtmn_diff = ev_rt_now - mn_now;
1077 1146
1078 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1147 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1079 return; /* all is well */ 1148 return; /* all is well */
1080 1149
1081 rt_now = ev_time (); 1150 ev_rt_now = ev_time ();
1082 mn_now = get_clock (); 1151 mn_now = get_clock ();
1083 now_floor = mn_now; 1152 now_floor = mn_now;
1084 } 1153 }
1085 1154
1155# if EV_PERIODICS
1086 periodics_reschedule (EV_A); 1156 periodics_reschedule (EV_A);
1157# endif
1087 /* no timer adjustment, as the monotonic clock doesn't jump */ 1158 /* no timer adjustment, as the monotonic clock doesn't jump */
1088 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1159 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1089 } 1160 }
1090 } 1161 }
1091 else 1162 else
1092#endif 1163#endif
1093 { 1164 {
1094 rt_now = ev_time (); 1165 ev_rt_now = ev_time ();
1095 1166
1096 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))
1097 { 1168 {
1169#if EV_PERIODICS
1098 periodics_reschedule (EV_A); 1170 periodics_reschedule (EV_A);
1171#endif
1099 1172
1100 /* 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 */
1101 for (i = 0; i < timercnt; ++i) 1174 for (i = 0; i < timercnt; ++i)
1102 ((WT)timers [i])->at += rt_now - mn_now; 1175 ((WT)timers [i])->at += ev_rt_now - mn_now;
1103 } 1176 }
1104 1177
1105 mn_now = rt_now; 1178 mn_now = ev_rt_now;
1106 } 1179 }
1107} 1180}
1108 1181
1109void 1182void
1110ev_ref (EV_P) 1183ev_ref (EV_P)
1124ev_loop (EV_P_ int flags) 1197ev_loop (EV_P_ int flags)
1125{ 1198{
1126 double block; 1199 double block;
1127 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1200 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1128 1201
1129 do 1202 while (activecnt)
1130 { 1203 {
1131 /* queue check watchers (and execute them) */ 1204 /* queue check watchers (and execute them) */
1132 if (expect_false (preparecnt)) 1205 if (expect_false (preparecnt))
1133 { 1206 {
1134 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1207 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1150 if (expect_true (have_monotonic)) 1223 if (expect_true (have_monotonic))
1151 time_update_monotonic (EV_A); 1224 time_update_monotonic (EV_A);
1152 else 1225 else
1153#endif 1226#endif
1154 { 1227 {
1155 rt_now = ev_time (); 1228 ev_rt_now = ev_time ();
1156 mn_now = rt_now; 1229 mn_now = ev_rt_now;
1157 } 1230 }
1158 1231
1159 if (flags & EVLOOP_NONBLOCK || idlecnt) 1232 if (flags & EVLOOP_NONBLOCK || idlecnt)
1160 block = 0.; 1233 block = 0.;
1161 else 1234 else
1166 { 1239 {
1167 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1240 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1168 if (block > to) block = to; 1241 if (block > to) block = to;
1169 } 1242 }
1170 1243
1244#if EV_PERIODICS
1171 if (periodiccnt) 1245 if (periodiccnt)
1172 { 1246 {
1173 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1247 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1174 if (block > to) block = to; 1248 if (block > to) block = to;
1175 } 1249 }
1250#endif
1176 1251
1177 if (block < 0.) block = 0.; 1252 if (expect_false (block < 0.)) block = 0.;
1178 } 1253 }
1179 1254
1180 method_poll (EV_A_ block); 1255 method_poll (EV_A_ block);
1181 1256
1182 /* update rt_now, do magic */ 1257 /* update ev_rt_now, do magic */
1183 time_update (EV_A); 1258 time_update (EV_A);
1184 1259
1185 /* queue pending timers and reschedule them */ 1260 /* queue pending timers and reschedule them */
1186 timers_reify (EV_A); /* relative timers called last */ 1261 timers_reify (EV_A); /* relative timers called last */
1262#if EV_PERIODICS
1187 periodics_reify (EV_A); /* absolute timers called first */ 1263 periodics_reify (EV_A); /* absolute timers called first */
1264#endif
1188 1265
1189 /* queue idle watchers unless io or timers are pending */ 1266 /* queue idle watchers unless io or timers are pending */
1190 if (idlecnt && !any_pending (EV_A)) 1267 if (idlecnt && !any_pending (EV_A))
1191 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1268 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1192 1269
1193 /* queue check watchers, to be executed first */ 1270 /* queue check watchers, to be executed first */
1194 if (checkcnt) 1271 if (expect_false (checkcnt))
1195 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1272 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1196 1273
1197 call_pending (EV_A); 1274 call_pending (EV_A);
1275
1276 if (expect_false (loop_done))
1277 break;
1198 } 1278 }
1199 while (activecnt && !loop_done);
1200 1279
1201 if (loop_done != 2) 1280 if (loop_done != 2)
1202 loop_done = 0; 1281 loop_done = 0;
1203} 1282}
1204 1283
1264void 1343void
1265ev_io_start (EV_P_ struct ev_io *w) 1344ev_io_start (EV_P_ struct ev_io *w)
1266{ 1345{
1267 int fd = w->fd; 1346 int fd = w->fd;
1268 1347
1269 if (ev_is_active (w)) 1348 if (expect_false (ev_is_active (w)))
1270 return; 1349 return;
1271 1350
1272 assert (("ev_io_start called with negative fd", fd >= 0)); 1351 assert (("ev_io_start called with negative fd", fd >= 0));
1273 1352
1274 ev_start (EV_A_ (W)w, 1); 1353 ev_start (EV_A_ (W)w, 1);
1280 1359
1281void 1360void
1282ev_io_stop (EV_P_ struct ev_io *w) 1361ev_io_stop (EV_P_ struct ev_io *w)
1283{ 1362{
1284 ev_clear_pending (EV_A_ (W)w); 1363 ev_clear_pending (EV_A_ (W)w);
1285 if (!ev_is_active (w)) 1364 if (expect_false (!ev_is_active (w)))
1286 return; 1365 return;
1366
1367 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1287 1368
1288 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1369 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1289 ev_stop (EV_A_ (W)w); 1370 ev_stop (EV_A_ (W)w);
1290 1371
1291 fd_change (EV_A_ w->fd); 1372 fd_change (EV_A_ w->fd);
1292} 1373}
1293 1374
1294void 1375void
1295ev_timer_start (EV_P_ struct ev_timer *w) 1376ev_timer_start (EV_P_ struct ev_timer *w)
1296{ 1377{
1297 if (ev_is_active (w)) 1378 if (expect_false (ev_is_active (w)))
1298 return; 1379 return;
1299 1380
1300 ((WT)w)->at += mn_now; 1381 ((WT)w)->at += mn_now;
1301 1382
1302 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.));
1303 1384
1304 ev_start (EV_A_ (W)w, ++timercnt); 1385 ev_start (EV_A_ (W)w, ++timercnt);
1305 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1386 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1306 timers [timercnt - 1] = w; 1387 timers [timercnt - 1] = w;
1307 upheap ((WT *)timers, timercnt - 1); 1388 upheap ((WT *)timers, timercnt - 1);
1308 1389
1309 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1390 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1310} 1391}
1311 1392
1312void 1393void
1313ev_timer_stop (EV_P_ struct ev_timer *w) 1394ev_timer_stop (EV_P_ struct ev_timer *w)
1314{ 1395{
1315 ev_clear_pending (EV_A_ (W)w); 1396 ev_clear_pending (EV_A_ (W)w);
1316 if (!ev_is_active (w)) 1397 if (expect_false (!ev_is_active (w)))
1317 return; 1398 return;
1318 1399
1319 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1400 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1320 1401
1321 if (((W)w)->active < timercnt--) 1402 if (expect_true (((W)w)->active < timercnt--))
1322 { 1403 {
1323 timers [((W)w)->active - 1] = timers [timercnt]; 1404 timers [((W)w)->active - 1] = timers [timercnt];
1324 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1405 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1325 } 1406 }
1326 1407
1327 ((WT)w)->at = w->repeat; 1408 ((WT)w)->at -= mn_now;
1328 1409
1329 ev_stop (EV_A_ (W)w); 1410 ev_stop (EV_A_ (W)w);
1330} 1411}
1331 1412
1332void 1413void
1333ev_timer_again (EV_P_ struct ev_timer *w) 1414ev_timer_again (EV_P_ struct ev_timer *w)
1334{ 1415{
1335 if (ev_is_active (w)) 1416 if (ev_is_active (w))
1336 { 1417 {
1337 if (w->repeat) 1418 if (w->repeat)
1419 {
1420 ((WT)w)->at = mn_now + w->repeat;
1338 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1421 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1422 }
1339 else 1423 else
1340 ev_timer_stop (EV_A_ w); 1424 ev_timer_stop (EV_A_ w);
1341 } 1425 }
1342 else if (w->repeat) 1426 else if (w->repeat)
1427 {
1428 w->at = w->repeat;
1343 ev_timer_start (EV_A_ w); 1429 ev_timer_start (EV_A_ w);
1430 }
1344} 1431}
1345 1432
1433#if EV_PERIODICS
1346void 1434void
1347ev_periodic_start (EV_P_ struct ev_periodic *w) 1435ev_periodic_start (EV_P_ struct ev_periodic *w)
1348{ 1436{
1349 if (ev_is_active (w)) 1437 if (expect_false (ev_is_active (w)))
1350 return; 1438 return;
1351 1439
1352 if (w->reschedule_cb) 1440 if (w->reschedule_cb)
1353 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1441 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1354 else if (w->interval) 1442 else if (w->interval)
1355 { 1443 {
1356 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.));
1357 /* 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 */
1358 ((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;
1359 } 1447 }
1360 1448
1361 ev_start (EV_A_ (W)w, ++periodiccnt); 1449 ev_start (EV_A_ (W)w, ++periodiccnt);
1362 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1450 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1363 periodics [periodiccnt - 1] = w; 1451 periodics [periodiccnt - 1] = w;
1364 upheap ((WT *)periodics, periodiccnt - 1); 1452 upheap ((WT *)periodics, periodiccnt - 1);
1365 1453
1366 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1454 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1367} 1455}
1368 1456
1369void 1457void
1370ev_periodic_stop (EV_P_ struct ev_periodic *w) 1458ev_periodic_stop (EV_P_ struct ev_periodic *w)
1371{ 1459{
1372 ev_clear_pending (EV_A_ (W)w); 1460 ev_clear_pending (EV_A_ (W)w);
1373 if (!ev_is_active (w)) 1461 if (expect_false (!ev_is_active (w)))
1374 return; 1462 return;
1375 1463
1376 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1464 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1377 1465
1378 if (((W)w)->active < periodiccnt--) 1466 if (expect_true (((W)w)->active < periodiccnt--))
1379 { 1467 {
1380 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1468 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1381 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1469 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1382 } 1470 }
1383 1471
1384 ev_stop (EV_A_ (W)w); 1472 ev_stop (EV_A_ (W)w);
1385} 1473}
1386 1474
1389{ 1477{
1390 /* TODO: use adjustheap and recalculation */ 1478 /* TODO: use adjustheap and recalculation */
1391 ev_periodic_stop (EV_A_ w); 1479 ev_periodic_stop (EV_A_ w);
1392 ev_periodic_start (EV_A_ w); 1480 ev_periodic_start (EV_A_ w);
1393} 1481}
1482#endif
1394 1483
1395void 1484void
1396ev_idle_start (EV_P_ struct ev_idle *w) 1485ev_idle_start (EV_P_ struct ev_idle *w)
1397{ 1486{
1398 if (ev_is_active (w)) 1487 if (expect_false (ev_is_active (w)))
1399 return; 1488 return;
1400 1489
1401 ev_start (EV_A_ (W)w, ++idlecnt); 1490 ev_start (EV_A_ (W)w, ++idlecnt);
1402 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1491 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1403 idles [idlecnt - 1] = w; 1492 idles [idlecnt - 1] = w;
1404} 1493}
1405 1494
1406void 1495void
1407ev_idle_stop (EV_P_ struct ev_idle *w) 1496ev_idle_stop (EV_P_ struct ev_idle *w)
1408{ 1497{
1409 ev_clear_pending (EV_A_ (W)w); 1498 ev_clear_pending (EV_A_ (W)w);
1410 if (ev_is_active (w)) 1499 if (expect_false (!ev_is_active (w)))
1411 return; 1500 return;
1412 1501
1413 idles [((W)w)->active - 1] = idles [--idlecnt]; 1502 idles [((W)w)->active - 1] = idles [--idlecnt];
1414 ev_stop (EV_A_ (W)w); 1503 ev_stop (EV_A_ (W)w);
1415} 1504}
1416 1505
1417void 1506void
1418ev_prepare_start (EV_P_ struct ev_prepare *w) 1507ev_prepare_start (EV_P_ struct ev_prepare *w)
1419{ 1508{
1420 if (ev_is_active (w)) 1509 if (expect_false (ev_is_active (w)))
1421 return; 1510 return;
1422 1511
1423 ev_start (EV_A_ (W)w, ++preparecnt); 1512 ev_start (EV_A_ (W)w, ++preparecnt);
1424 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1513 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1425 prepares [preparecnt - 1] = w; 1514 prepares [preparecnt - 1] = w;
1426} 1515}
1427 1516
1428void 1517void
1429ev_prepare_stop (EV_P_ struct ev_prepare *w) 1518ev_prepare_stop (EV_P_ struct ev_prepare *w)
1430{ 1519{
1431 ev_clear_pending (EV_A_ (W)w); 1520 ev_clear_pending (EV_A_ (W)w);
1432 if (ev_is_active (w)) 1521 if (expect_false (!ev_is_active (w)))
1433 return; 1522 return;
1434 1523
1435 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1524 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1436 ev_stop (EV_A_ (W)w); 1525 ev_stop (EV_A_ (W)w);
1437} 1526}
1438 1527
1439void 1528void
1440ev_check_start (EV_P_ struct ev_check *w) 1529ev_check_start (EV_P_ struct ev_check *w)
1441{ 1530{
1442 if (ev_is_active (w)) 1531 if (expect_false (ev_is_active (w)))
1443 return; 1532 return;
1444 1533
1445 ev_start (EV_A_ (W)w, ++checkcnt); 1534 ev_start (EV_A_ (W)w, ++checkcnt);
1446 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1535 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1447 checks [checkcnt - 1] = w; 1536 checks [checkcnt - 1] = w;
1448} 1537}
1449 1538
1450void 1539void
1451ev_check_stop (EV_P_ struct ev_check *w) 1540ev_check_stop (EV_P_ struct ev_check *w)
1452{ 1541{
1453 ev_clear_pending (EV_A_ (W)w); 1542 ev_clear_pending (EV_A_ (W)w);
1454 if (ev_is_active (w)) 1543 if (expect_false (!ev_is_active (w)))
1455 return; 1544 return;
1456 1545
1457 checks [((W)w)->active - 1] = checks [--checkcnt]; 1546 checks [((W)w)->active - 1] = checks [--checkcnt];
1458 ev_stop (EV_A_ (W)w); 1547 ev_stop (EV_A_ (W)w);
1459} 1548}
1464 1553
1465void 1554void
1466ev_signal_start (EV_P_ struct ev_signal *w) 1555ev_signal_start (EV_P_ struct ev_signal *w)
1467{ 1556{
1468#if EV_MULTIPLICITY 1557#if EV_MULTIPLICITY
1469 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));
1470#endif 1559#endif
1471 if (ev_is_active (w)) 1560 if (expect_false (ev_is_active (w)))
1472 return; 1561 return;
1473 1562
1474 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));
1475 1564
1476 ev_start (EV_A_ (W)w, 1); 1565 ev_start (EV_A_ (W)w, 1);
1477 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1566 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1478 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1567 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1479 1568
1480 if (!((WL)w)->next) 1569 if (!((WL)w)->next)
1481 { 1570 {
1482#if WIN32 1571#if _WIN32
1483 signal (w->signum, sighandler); 1572 signal (w->signum, sighandler);
1484#else 1573#else
1485 struct sigaction sa; 1574 struct sigaction sa;
1486 sa.sa_handler = sighandler; 1575 sa.sa_handler = sighandler;
1487 sigfillset (&sa.sa_mask); 1576 sigfillset (&sa.sa_mask);
1493 1582
1494void 1583void
1495ev_signal_stop (EV_P_ struct ev_signal *w) 1584ev_signal_stop (EV_P_ struct ev_signal *w)
1496{ 1585{
1497 ev_clear_pending (EV_A_ (W)w); 1586 ev_clear_pending (EV_A_ (W)w);
1498 if (!ev_is_active (w)) 1587 if (expect_false (!ev_is_active (w)))
1499 return; 1588 return;
1500 1589
1501 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1590 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1502 ev_stop (EV_A_ (W)w); 1591 ev_stop (EV_A_ (W)w);
1503 1592
1507 1596
1508void 1597void
1509ev_child_start (EV_P_ struct ev_child *w) 1598ev_child_start (EV_P_ struct ev_child *w)
1510{ 1599{
1511#if EV_MULTIPLICITY 1600#if EV_MULTIPLICITY
1512 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));
1513#endif 1602#endif
1514 if (ev_is_active (w)) 1603 if (expect_false (ev_is_active (w)))
1515 return; 1604 return;
1516 1605
1517 ev_start (EV_A_ (W)w, 1); 1606 ev_start (EV_A_ (W)w, 1);
1518 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1607 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1519} 1608}
1520 1609
1521void 1610void
1522ev_child_stop (EV_P_ struct ev_child *w) 1611ev_child_stop (EV_P_ struct ev_child *w)
1523{ 1612{
1524 ev_clear_pending (EV_A_ (W)w); 1613 ev_clear_pending (EV_A_ (W)w);
1525 if (ev_is_active (w)) 1614 if (expect_false (!ev_is_active (w)))
1526 return; 1615 return;
1527 1616
1528 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1617 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1529 ev_stop (EV_A_ (W)w); 1618 ev_stop (EV_A_ (W)w);
1530} 1619}
1567void 1656void
1568ev_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)
1569{ 1658{
1570 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));
1571 1660
1572 if (!once) 1661 if (expect_false (!once))
1662 {
1573 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1663 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1574 else 1664 return;
1575 { 1665 }
1666
1576 once->cb = cb; 1667 once->cb = cb;
1577 once->arg = arg; 1668 once->arg = arg;
1578 1669
1579 ev_init (&once->io, once_cb_io); 1670 ev_init (&once->io, once_cb_io);
1580 if (fd >= 0) 1671 if (fd >= 0)
1581 { 1672 {
1582 ev_io_set (&once->io, fd, events); 1673 ev_io_set (&once->io, fd, events);
1583 ev_io_start (EV_A_ &once->io); 1674 ev_io_start (EV_A_ &once->io);
1584 } 1675 }
1585 1676
1586 ev_init (&once->to, once_cb_to); 1677 ev_init (&once->to, once_cb_to);
1587 if (timeout >= 0.) 1678 if (timeout >= 0.)
1588 { 1679 {
1589 ev_timer_set (&once->to, timeout, 0.); 1680 ev_timer_set (&once->to, timeout, 0.);
1590 ev_timer_start (EV_A_ &once->to); 1681 ev_timer_start (EV_A_ &once->to);
1591 }
1592 } 1682 }
1593} 1683}
1594 1684
1685#ifdef __cplusplus
1686}
1687#endif
1688

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines