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.128 by root, Thu Nov 22 12:28:27 2007 UTC

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

Diff Legend

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