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.123 by root, Sat Nov 17 02:23:54 2007 UTC

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

Diff Legend

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