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

Comparing libev/ev.c (file contents):
Revision 1.78 by root, Thu Nov 8 21:08:56 2007 UTC vs.
Revision 1.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
… …
342 414
343 for (i = 0; i < eventcnt; ++i) 415 for (i = 0; i < eventcnt; ++i)
344 ev_feed_event (EV_A_ events [i], type); 416 ev_feed_event (EV_A_ events [i], type);
345} 417}
346 418
347static void 419inline void
348fd_event (EV_P_ int fd, int events) 420fd_event (EV_P_ int fd, int revents)
349{ 421{
350 ANFD *anfd = anfds + fd; 422 ANFD *anfd = anfds + fd;
351 struct ev_io *w; 423 struct ev_io *w;
352 424
353 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 425 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
354 { 426 {
355 int ev = w->events & events; 427 int ev = w->events & revents;
356 428
357 if (ev) 429 if (ev)
358 ev_feed_event (EV_A_ (W)w, ev); 430 ev_feed_event (EV_A_ (W)w, ev);
359 } 431 }
360} 432}
361 433
434void
435ev_feed_fd_event (EV_P_ int fd, int revents)
436{
437 fd_event (EV_A_ fd, revents);
438}
439
362/*****************************************************************************/ 440/*****************************************************************************/
363 441
364static void 442inline void
365fd_reify (EV_P) 443fd_reify (EV_P)
366{ 444{
367 int i; 445 int i;
368 446
369 for (i = 0; i < fdchangecnt; ++i) 447 for (i = 0; i < fdchangecnt; ++i)
… …
375 int events = 0; 453 int events = 0;
376 454
377 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)
378 events |= w->events; 456 events |= w->events;
379 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
380 anfd->reify = 0; 467 anfd->reify = 0;
381 468
382 method_modify (EV_A_ fd, anfd->events, events); 469 method_modify (EV_A_ fd, anfd->events, events);
383 anfd->events = events; 470 anfd->events = events;
384 } 471 }
… …
387} 474}
388 475
389static void 476static void
390fd_change (EV_P_ int fd) 477fd_change (EV_P_ int fd)
391{ 478{
392 if (anfds [fd].reify) 479 if (expect_false (anfds [fd].reify))
393 return; 480 return;
394 481
395 anfds [fd].reify = 1; 482 anfds [fd].reify = 1;
396 483
397 ++fdchangecnt; 484 ++fdchangecnt;
398 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 485 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
399 fdchanges [fdchangecnt - 1] = fd; 486 fdchanges [fdchangecnt - 1] = fd;
400} 487}
401 488
402static void 489static void
403fd_kill (EV_P_ int fd) 490fd_kill (EV_P_ int fd)
… …
409 ev_io_stop (EV_A_ w); 496 ev_io_stop (EV_A_ w);
410 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);
411 } 498 }
412} 499}
413 500
414static int 501inline int
415fd_valid (int fd) 502fd_valid (int fd)
416{ 503{
417#ifdef WIN32 504#ifdef _WIN32
418 return !!win32_get_osfhandle (fd); 505 return _get_osfhandle (fd) != -1;
419#else 506#else
420 return fcntl (fd, F_GETFD) != -1; 507 return fcntl (fd, F_GETFD) != -1;
421#endif 508#endif
422} 509}
423 510
… …
503 590
504 heap [k] = w; 591 heap [k] = w;
505 ((W)heap [k])->active = k + 1; 592 ((W)heap [k])->active = k + 1;
506} 593}
507 594
595inline void
596adjustheap (WT *heap, int N, int k)
597{
598 upheap (heap, k);
599 downheap (heap, N, k);
600}
601
508/*****************************************************************************/ 602/*****************************************************************************/
509 603
510typedef struct 604typedef struct
511{ 605{
512 WL head; 606 WL head;
… …
533} 627}
534 628
535static void 629static void
536sighandler (int signum) 630sighandler (int signum)
537{ 631{
538#if WIN32 632#if _WIN32
539 signal (signum, sighandler); 633 signal (signum, sighandler);
540#endif 634#endif
541 635
542 signals [signum - 1].gotsig = 1; 636 signals [signum - 1].gotsig = 1;
543 637
544 if (!gotsig) 638 if (!gotsig)
545 { 639 {
546 int old_errno = errno; 640 int old_errno = errno;
547 gotsig = 1; 641 gotsig = 1;
548#ifdef WIN32
549 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
550#else
551 write (sigpipe [1], &signum, 1); 642 write (sigpipe [1], &signum, 1);
552#endif
553 errno = old_errno; 643 errno = old_errno;
554 } 644 }
555} 645}
556 646
647void
648ev_feed_signal_event (EV_P_ int signum)
649{
650 WL w;
651
652#if EV_MULTIPLICITY
653 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
654#endif
655
656 --signum;
657
658 if (signum < 0 || signum >= signalmax)
659 return;
660
661 signals [signum].gotsig = 0;
662
663 for (w = signals [signum].head; w; w = w->next)
664 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
665}
666
557static void 667static void
558sigcb (EV_P_ struct ev_io *iow, int revents) 668sigcb (EV_P_ struct ev_io *iow, int revents)
559{ 669{
560 WL w;
561 int signum; 670 int signum;
562 671
563#ifdef WIN32
564 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
565#else
566 read (sigpipe [0], &revents, 1); 672 read (sigpipe [0], &revents, 1);
567#endif
568 gotsig = 0; 673 gotsig = 0;
569 674
570 for (signum = signalmax; signum--; ) 675 for (signum = signalmax; signum--; )
571 if (signals [signum].gotsig) 676 if (signals [signum].gotsig)
572 { 677 ev_feed_signal_event (EV_A_ signum + 1);
573 signals [signum].gotsig = 0; 678}
574 679
575 for (w = signals [signum].head; w; w = w->next) 680static void
576 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 681fd_intern (int fd)
577 } 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
578} 690}
579 691
580static void 692static void
581siginit (EV_P) 693siginit (EV_P)
582{ 694{
583#ifndef WIN32 695 fd_intern (sigpipe [0]);
584 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 696 fd_intern (sigpipe [1]);
585 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
586
587 /* rather than sort out wether we really need nb, set it */
588 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
589 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
590#endif
591 697
592 ev_io_set (&sigev, sigpipe [0], EV_READ); 698 ev_io_set (&sigev, sigpipe [0], EV_READ);
593 ev_io_start (EV_A_ &sigev); 699 ev_io_start (EV_A_ &sigev);
594 ev_unref (EV_A); /* child watcher should not keep loop alive */ 700 ev_unref (EV_A); /* child watcher should not keep loop alive */
595} 701}
596 702
597/*****************************************************************************/ 703/*****************************************************************************/
598 704
599static struct ev_child *childs [PID_HASHSIZE]; 705static struct ev_child *childs [PID_HASHSIZE];
600 706
601#ifndef WIN32 707#ifndef _WIN32
602 708
603static struct ev_signal childev; 709static struct ev_signal childev;
604 710
605#ifndef WCONTINUED 711#ifndef WCONTINUED
606# define WCONTINUED 0 712# define WCONTINUED 0
… …
638 744
639#endif 745#endif
640 746
641/*****************************************************************************/ 747/*****************************************************************************/
642 748
749#if EV_USE_PORT
750# include "ev_port.c"
751#endif
643#if EV_USE_KQUEUE 752#if EV_USE_KQUEUE
644# include "ev_kqueue.c" 753# include "ev_kqueue.c"
645#endif 754#endif
646#if EV_USE_EPOLL 755#if EV_USE_EPOLL
647# include "ev_epoll.c" 756# include "ev_epoll.c"
… …
667 776
668/* 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 */
669static int 778static int
670enable_secure (void) 779enable_secure (void)
671{ 780{
672#ifdef WIN32 781#ifdef _WIN32
673 return 0; 782 return 0;
674#else 783#else
675 return getuid () != geteuid () 784 return getuid () != geteuid ()
676 || getgid () != getegid (); 785 || getgid () != getegid ();
677#endif 786#endif
678} 787}
679 788
680int 789unsigned int
681ev_method (EV_P) 790ev_method (EV_P)
682{ 791{
683 return method; 792 return method;
684} 793}
685 794
686static void 795static void
687loop_init (EV_P_ int methods) 796loop_init (EV_P_ unsigned int flags)
688{ 797{
689 if (!method) 798 if (!method)
690 { 799 {
691#if EV_USE_MONOTONIC 800#if EV_USE_MONOTONIC
692 { 801 {
… …
694 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 803 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
695 have_monotonic = 1; 804 have_monotonic = 1;
696 } 805 }
697#endif 806#endif
698 807
699 rt_now = ev_time (); 808 ev_rt_now = ev_time ();
700 mn_now = get_clock (); 809 mn_now = get_clock ();
701 now_floor = mn_now; 810 now_floor = mn_now;
702 rtmn_diff = rt_now - mn_now; 811 rtmn_diff = ev_rt_now - mn_now;
703 812
704 if (methods == EVMETHOD_AUTO) 813 if (!(flags & EVFLAG_NOENV)
705 if (!enable_secure () && getenv ("LIBEV_METHODS")) 814 && !enable_secure ()
815 && getenv ("LIBEV_FLAGS"))
706 methods = atoi (getenv ("LIBEV_METHODS")); 816 flags = atoi (getenv ("LIBEV_FLAGS"));
817
818 if (!(flags & EVMETHOD_ALL))
707 else 819 {
708 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 }
709 827
710 method = 0; 828 method = 0;
711#if EV_USE_WIN32 829#if EV_USE_PORT
712 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 830 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
713#endif 831#endif
714#if EV_USE_KQUEUE 832#if EV_USE_KQUEUE
715 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 833 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
716#endif 834#endif
717#if EV_USE_EPOLL 835#if EV_USE_EPOLL
718 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 836 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
719#endif 837#endif
720#if EV_USE_POLL 838#if EV_USE_POLL
721 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 839 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
722#endif 840#endif
723#if EV_USE_SELECT 841#if EV_USE_SELECT
724 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 842 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
725#endif 843#endif
726 844
727 ev_watcher_init (&sigev, sigcb); 845 ev_init (&sigev, sigcb);
728 ev_set_priority (&sigev, EV_MAXPRI); 846 ev_set_priority (&sigev, EV_MAXPRI);
729 } 847 }
730} 848}
731 849
732void 850static void
733loop_destroy (EV_P) 851loop_destroy (EV_P)
734{ 852{
735 int i; 853 int i;
736 854
737#if EV_USE_WIN32 855#if EV_USE_PORT
738 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 856 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
739#endif 857#endif
740#if EV_USE_KQUEUE 858#if EV_USE_KQUEUE
741 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 859 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
742#endif 860#endif
743#if EV_USE_EPOLL 861#if EV_USE_EPOLL
… …
752 870
753 for (i = NUMPRI; i--; ) 871 for (i = NUMPRI; i--; )
754 array_free (pending, [i]); 872 array_free (pending, [i]);
755 873
756 /* have to use the microsoft-never-gets-it-right macro */ 874 /* have to use the microsoft-never-gets-it-right macro */
757 array_free_microshit (fdchange); 875 array_free (fdchange, EMPTY0);
758 array_free_microshit (timer); 876 array_free (timer, EMPTY0);
759 array_free_microshit (periodic); 877#if EV_PERIODICS
760 array_free_microshit (idle); 878 array_free (periodic, EMPTY0);
761 array_free_microshit (prepare); 879#endif
762 array_free_microshit (check); 880 array_free (idle, EMPTY0);
881 array_free (prepare, EMPTY0);
882 array_free (check, EMPTY0);
763 883
764 method = 0; 884 method = 0;
765} 885}
766 886
767static void 887static void
768loop_fork (EV_P) 888loop_fork (EV_P)
769{ 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
770#if EV_USE_EPOLL 896#if EV_USE_EPOLL
771 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 897 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
772#endif
773#if EV_USE_KQUEUE
774 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
775#endif 898#endif
776 899
777 if (ev_is_active (&sigev)) 900 if (ev_is_active (&sigev))
778 { 901 {
779 /* default loop */ 902 /* default loop */
… …
792 postfork = 0; 915 postfork = 0;
793} 916}
794 917
795#if EV_MULTIPLICITY 918#if EV_MULTIPLICITY
796struct ev_loop * 919struct ev_loop *
797ev_loop_new (int methods) 920ev_loop_new (unsigned int flags)
798{ 921{
799 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));
800 923
801 memset (loop, 0, sizeof (struct ev_loop)); 924 memset (loop, 0, sizeof (struct ev_loop));
802 925
803 loop_init (EV_A_ methods); 926 loop_init (EV_A_ flags);
804 927
805 if (ev_method (EV_A)) 928 if (ev_method (EV_A))
806 return loop; 929 return loop;
807 930
808 return 0; 931 return 0;
… …
822} 945}
823 946
824#endif 947#endif
825 948
826#if EV_MULTIPLICITY 949#if EV_MULTIPLICITY
827struct ev_loop default_loop_struct;
828static struct ev_loop *default_loop;
829
830struct ev_loop * 950struct ev_loop *
951ev_default_loop_init (unsigned int flags)
831#else 952#else
832static int default_loop;
833
834int 953int
954ev_default_loop (unsigned int flags)
835#endif 955#endif
836ev_default_loop (int methods)
837{ 956{
838 if (sigpipe [0] == sigpipe [1]) 957 if (sigpipe [0] == sigpipe [1])
839 if (pipe (sigpipe)) 958 if (pipe (sigpipe))
840 return 0; 959 return 0;
841 960
842 if (!default_loop) 961 if (!ev_default_loop_ptr)
843 { 962 {
844#if EV_MULTIPLICITY 963#if EV_MULTIPLICITY
845 struct ev_loop *loop = default_loop = &default_loop_struct; 964 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
846#else 965#else
847 default_loop = 1; 966 ev_default_loop_ptr = 1;
848#endif 967#endif
849 968
850 loop_init (EV_A_ methods); 969 loop_init (EV_A_ flags);
851 970
852 if (ev_method (EV_A)) 971 if (ev_method (EV_A))
853 { 972 {
854 siginit (EV_A); 973 siginit (EV_A);
855 974
856#ifndef WIN32 975#ifndef _WIN32
857 ev_signal_init (&childev, childcb, SIGCHLD); 976 ev_signal_init (&childev, childcb, SIGCHLD);
858 ev_set_priority (&childev, EV_MAXPRI); 977 ev_set_priority (&childev, EV_MAXPRI);
859 ev_signal_start (EV_A_ &childev); 978 ev_signal_start (EV_A_ &childev);
860 ev_unref (EV_A); /* child watcher should not keep loop alive */ 979 ev_unref (EV_A); /* child watcher should not keep loop alive */
861#endif 980#endif
862 } 981 }
863 else 982 else
864 default_loop = 0; 983 ev_default_loop_ptr = 0;
865 } 984 }
866 985
867 return default_loop; 986 return ev_default_loop_ptr;
868} 987}
869 988
870void 989void
871ev_default_destroy (void) 990ev_default_destroy (void)
872{ 991{
873#if EV_MULTIPLICITY 992#if EV_MULTIPLICITY
874 struct ev_loop *loop = default_loop; 993 struct ev_loop *loop = ev_default_loop_ptr;
875#endif 994#endif
876 995
877#ifndef WIN32 996#ifndef _WIN32
878 ev_ref (EV_A); /* child watcher */ 997 ev_ref (EV_A); /* child watcher */
879 ev_signal_stop (EV_A_ &childev); 998 ev_signal_stop (EV_A_ &childev);
880#endif 999#endif
881 1000
882 ev_ref (EV_A); /* signal watcher */ 1001 ev_ref (EV_A); /* signal watcher */
… …
890 1009
891void 1010void
892ev_default_fork (void) 1011ev_default_fork (void)
893{ 1012{
894#if EV_MULTIPLICITY 1013#if EV_MULTIPLICITY
895 struct ev_loop *loop = default_loop; 1014 struct ev_loop *loop = ev_default_loop_ptr;
896#endif 1015#endif
897 1016
898 if (method) 1017 if (method)
899 postfork = 1; 1018 postfork = 1;
900} 1019}
… …
911 return 1; 1030 return 1;
912 1031
913 return 0; 1032 return 0;
914} 1033}
915 1034
916static void 1035inline void
917call_pending (EV_P) 1036call_pending (EV_P)
918{ 1037{
919 int pri; 1038 int pri;
920 1039
921 for (pri = NUMPRI; pri--; ) 1040 for (pri = NUMPRI; pri--; )
922 while (pendingcnt [pri]) 1041 while (pendingcnt [pri])
923 { 1042 {
924 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1043 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
925 1044
926 if (p->w) 1045 if (expect_true (p->w))
927 { 1046 {
928 p->w->pending = 0; 1047 p->w->pending = 0;
929 p->w->cb (EV_A_ p->w, p->events); 1048 EV_CB_INVOKE (p->w, p->events);
930 } 1049 }
931 } 1050 }
932} 1051}
933 1052
934static void 1053inline void
935timers_reify (EV_P) 1054timers_reify (EV_P)
936{ 1055{
937 while (timercnt && ((WT)timers [0])->at <= mn_now) 1056 while (timercnt && ((WT)timers [0])->at <= mn_now)
938 { 1057 {
939 struct ev_timer *w = timers [0]; 1058 struct ev_timer *w = timers [0];
… …
942 1061
943 /* first reschedule or stop timer */ 1062 /* first reschedule or stop timer */
944 if (w->repeat) 1063 if (w->repeat)
945 { 1064 {
946 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
947 ((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
948 downheap ((WT *)timers, timercnt, 0); 1071 downheap ((WT *)timers, timercnt, 0);
949 } 1072 }
950 else 1073 else
951 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1074 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
952 1075
953 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1076 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
954 } 1077 }
955} 1078}
956 1079
957static void 1080#if EV_PERIODICS
1081inline void
958periodics_reify (EV_P) 1082periodics_reify (EV_P)
959{ 1083{
960 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1084 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
961 { 1085 {
962 struct ev_periodic *w = periodics [0]; 1086 struct ev_periodic *w = periodics [0];
963 1087
964 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1088 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
965 1089
966 /* first reschedule or stop timer */ 1090 /* first reschedule or stop timer */
967 if (w->reschedule_cb) 1091 if (w->reschedule_cb)
968 { 1092 {
969 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);
970
971 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));
972 downheap ((WT *)periodics, periodiccnt, 0); 1095 downheap ((WT *)periodics, periodiccnt, 0);
973 } 1096 }
974 else if (w->interval) 1097 else if (w->interval)
975 { 1098 {
976 ((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;
977 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));
978 downheap ((WT *)periodics, periodiccnt, 0); 1101 downheap ((WT *)periodics, periodiccnt, 0);
979 } 1102 }
980 else 1103 else
981 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1104 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
982 1105
… …
993 for (i = 0; i < periodiccnt; ++i) 1116 for (i = 0; i < periodiccnt; ++i)
994 { 1117 {
995 struct ev_periodic *w = periodics [i]; 1118 struct ev_periodic *w = periodics [i];
996 1119
997 if (w->reschedule_cb) 1120 if (w->reschedule_cb)
998 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1121 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
999 else if (w->interval) 1122 else if (w->interval)
1000 ((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;
1001 } 1124 }
1002 1125
1003 /* now rebuild the heap */ 1126 /* now rebuild the heap */
1004 for (i = periodiccnt >> 1; i--; ) 1127 for (i = periodiccnt >> 1; i--; )
1005 downheap ((WT *)periodics, periodiccnt, i); 1128 downheap ((WT *)periodics, periodiccnt, i);
1006} 1129}
1130#endif
1007 1131
1008inline int 1132inline int
1009time_update_monotonic (EV_P) 1133time_update_monotonic (EV_P)
1010{ 1134{
1011 mn_now = get_clock (); 1135 mn_now = get_clock ();
1012 1136
1013 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1137 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1014 { 1138 {
1015 rt_now = rtmn_diff + mn_now; 1139 ev_rt_now = rtmn_diff + mn_now;
1016 return 0; 1140 return 0;
1017 } 1141 }
1018 else 1142 else
1019 { 1143 {
1020 now_floor = mn_now; 1144 now_floor = mn_now;
1021 rt_now = ev_time (); 1145 ev_rt_now = ev_time ();
1022 return 1; 1146 return 1;
1023 } 1147 }
1024} 1148}
1025 1149
1026static void 1150inline void
1027time_update (EV_P) 1151time_update (EV_P)
1028{ 1152{
1029 int i; 1153 int i;
1030 1154
1031#if EV_USE_MONOTONIC 1155#if EV_USE_MONOTONIC
… …
1035 { 1159 {
1036 ev_tstamp odiff = rtmn_diff; 1160 ev_tstamp odiff = rtmn_diff;
1037 1161
1038 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 */
1039 { 1163 {
1040 rtmn_diff = rt_now - mn_now; 1164 rtmn_diff = ev_rt_now - mn_now;
1041 1165
1042 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1166 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1043 return; /* all is well */ 1167 return; /* all is well */
1044 1168
1045 rt_now = ev_time (); 1169 ev_rt_now = ev_time ();
1046 mn_now = get_clock (); 1170 mn_now = get_clock ();
1047 now_floor = mn_now; 1171 now_floor = mn_now;
1048 } 1172 }
1049 1173
1174# if EV_PERIODICS
1050 periodics_reschedule (EV_A); 1175 periodics_reschedule (EV_A);
1176# endif
1051 /* no timer adjustment, as the monotonic clock doesn't jump */ 1177 /* no timer adjustment, as the monotonic clock doesn't jump */
1052 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1178 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1053 } 1179 }
1054 } 1180 }
1055 else 1181 else
1056#endif 1182#endif
1057 { 1183 {
1058 rt_now = ev_time (); 1184 ev_rt_now = ev_time ();
1059 1185
1060 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))
1061 { 1187 {
1188#if EV_PERIODICS
1062 periodics_reschedule (EV_A); 1189 periodics_reschedule (EV_A);
1190#endif
1063 1191
1064 /* 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 */
1065 for (i = 0; i < timercnt; ++i) 1193 for (i = 0; i < timercnt; ++i)
1066 ((WT)timers [i])->at += rt_now - mn_now; 1194 ((WT)timers [i])->at += ev_rt_now - mn_now;
1067 } 1195 }
1068 1196
1069 mn_now = rt_now; 1197 mn_now = ev_rt_now;
1070 } 1198 }
1071} 1199}
1072 1200
1073void 1201void
1074ev_ref (EV_P) 1202ev_ref (EV_P)
… …
1088ev_loop (EV_P_ int flags) 1216ev_loop (EV_P_ int flags)
1089{ 1217{
1090 double block; 1218 double block;
1091 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1219 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1092 1220
1093 do 1221 while (activecnt)
1094 { 1222 {
1095 /* queue check watchers (and execute them) */ 1223 /* queue check watchers (and execute them) */
1096 if (expect_false (preparecnt)) 1224 if (expect_false (preparecnt))
1097 { 1225 {
1098 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1226 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1114 if (expect_true (have_monotonic)) 1242 if (expect_true (have_monotonic))
1115 time_update_monotonic (EV_A); 1243 time_update_monotonic (EV_A);
1116 else 1244 else
1117#endif 1245#endif
1118 { 1246 {
1119 rt_now = ev_time (); 1247 ev_rt_now = ev_time ();
1120 mn_now = rt_now; 1248 mn_now = ev_rt_now;
1121 } 1249 }
1122 1250
1123 if (flags & EVLOOP_NONBLOCK || idlecnt) 1251 if (flags & EVLOOP_NONBLOCK || idlecnt)
1124 block = 0.; 1252 block = 0.;
1125 else 1253 else
… …
1130 { 1258 {
1131 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1259 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1132 if (block > to) block = to; 1260 if (block > to) block = to;
1133 } 1261 }
1134 1262
1263#if EV_PERIODICS
1135 if (periodiccnt) 1264 if (periodiccnt)
1136 { 1265 {
1137 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1266 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1138 if (block > to) block = to; 1267 if (block > to) block = to;
1139 } 1268 }
1269#endif
1140 1270
1141 if (block < 0.) block = 0.; 1271 if (expect_false (block < 0.)) block = 0.;
1142 } 1272 }
1143 1273
1144 method_poll (EV_A_ block); 1274 method_poll (EV_A_ block);
1145 1275
1146 /* update rt_now, do magic */ 1276 /* update ev_rt_now, do magic */
1147 time_update (EV_A); 1277 time_update (EV_A);
1148 1278
1149 /* queue pending timers and reschedule them */ 1279 /* queue pending timers and reschedule them */
1150 timers_reify (EV_A); /* relative timers called last */ 1280 timers_reify (EV_A); /* relative timers called last */
1281#if EV_PERIODICS
1151 periodics_reify (EV_A); /* absolute timers called first */ 1282 periodics_reify (EV_A); /* absolute timers called first */
1283#endif
1152 1284
1153 /* queue idle watchers unless io or timers are pending */ 1285 /* queue idle watchers unless io or timers are pending */
1154 if (idlecnt && !any_pending (EV_A)) 1286 if (idlecnt && !any_pending (EV_A))
1155 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1287 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1156 1288
1157 /* queue check watchers, to be executed first */ 1289 /* queue check watchers, to be executed first */
1158 if (checkcnt) 1290 if (expect_false (checkcnt))
1159 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1291 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1160 1292
1161 call_pending (EV_A); 1293 call_pending (EV_A);
1294
1295 if (expect_false (loop_done))
1296 break;
1162 } 1297 }
1163 while (activecnt && !loop_done);
1164 1298
1165 if (loop_done != 2) 1299 if (loop_done != 2)
1166 loop_done = 0; 1300 loop_done = 0;
1167} 1301}
1168 1302
… …
1228void 1362void
1229ev_io_start (EV_P_ struct ev_io *w) 1363ev_io_start (EV_P_ struct ev_io *w)
1230{ 1364{
1231 int fd = w->fd; 1365 int fd = w->fd;
1232 1366
1233 if (ev_is_active (w)) 1367 if (expect_false (ev_is_active (w)))
1234 return; 1368 return;
1235 1369
1236 assert (("ev_io_start called with negative fd", fd >= 0)); 1370 assert (("ev_io_start called with negative fd", fd >= 0));
1237 1371
1238 ev_start (EV_A_ (W)w, 1); 1372 ev_start (EV_A_ (W)w, 1);
… …
1244 1378
1245void 1379void
1246ev_io_stop (EV_P_ struct ev_io *w) 1380ev_io_stop (EV_P_ struct ev_io *w)
1247{ 1381{
1248 ev_clear_pending (EV_A_ (W)w); 1382 ev_clear_pending (EV_A_ (W)w);
1249 if (!ev_is_active (w)) 1383 if (expect_false (!ev_is_active (w)))
1250 return; 1384 return;
1385
1386 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1251 1387
1252 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1388 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1253 ev_stop (EV_A_ (W)w); 1389 ev_stop (EV_A_ (W)w);
1254 1390
1255 fd_change (EV_A_ w->fd); 1391 fd_change (EV_A_ w->fd);
1256} 1392}
1257 1393
1258void 1394void
1259ev_timer_start (EV_P_ struct ev_timer *w) 1395ev_timer_start (EV_P_ struct ev_timer *w)
1260{ 1396{
1261 if (ev_is_active (w)) 1397 if (expect_false (ev_is_active (w)))
1262 return; 1398 return;
1263 1399
1264 ((WT)w)->at += mn_now; 1400 ((WT)w)->at += mn_now;
1265 1401
1266 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.));
1267 1403
1268 ev_start (EV_A_ (W)w, ++timercnt); 1404 ev_start (EV_A_ (W)w, ++timercnt);
1269 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1405 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1270 timers [timercnt - 1] = w; 1406 timers [timercnt - 1] = w;
1271 upheap ((WT *)timers, timercnt - 1); 1407 upheap ((WT *)timers, timercnt - 1);
1272 1408
1273 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1409 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1274} 1410}
1275 1411
1276void 1412void
1277ev_timer_stop (EV_P_ struct ev_timer *w) 1413ev_timer_stop (EV_P_ struct ev_timer *w)
1278{ 1414{
1279 ev_clear_pending (EV_A_ (W)w); 1415 ev_clear_pending (EV_A_ (W)w);
1280 if (!ev_is_active (w)) 1416 if (expect_false (!ev_is_active (w)))
1281 return; 1417 return;
1282 1418
1283 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1419 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1284 1420
1285 if (((W)w)->active < timercnt--) 1421 if (expect_true (((W)w)->active < timercnt--))
1286 { 1422 {
1287 timers [((W)w)->active - 1] = timers [timercnt]; 1423 timers [((W)w)->active - 1] = timers [timercnt];
1288 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1424 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1289 } 1425 }
1290 1426
1291 ((WT)w)->at = w->repeat; 1427 ((WT)w)->at -= mn_now;
1292 1428
1293 ev_stop (EV_A_ (W)w); 1429 ev_stop (EV_A_ (W)w);
1294} 1430}
1295 1431
1296void 1432void
… …
1299 if (ev_is_active (w)) 1435 if (ev_is_active (w))
1300 { 1436 {
1301 if (w->repeat) 1437 if (w->repeat)
1302 { 1438 {
1303 ((WT)w)->at = mn_now + w->repeat; 1439 ((WT)w)->at = mn_now + w->repeat;
1304 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1440 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1305 } 1441 }
1306 else 1442 else
1307 ev_timer_stop (EV_A_ w); 1443 ev_timer_stop (EV_A_ w);
1308 } 1444 }
1309 else if (w->repeat) 1445 else if (w->repeat)
1446 {
1447 w->at = w->repeat;
1310 ev_timer_start (EV_A_ w); 1448 ev_timer_start (EV_A_ w);
1449 }
1311} 1450}
1312 1451
1452#if EV_PERIODICS
1313void 1453void
1314ev_periodic_start (EV_P_ struct ev_periodic *w) 1454ev_periodic_start (EV_P_ struct ev_periodic *w)
1315{ 1455{
1316 if (ev_is_active (w)) 1456 if (expect_false (ev_is_active (w)))
1317 return; 1457 return;
1318 1458
1319 if (w->reschedule_cb) 1459 if (w->reschedule_cb)
1320 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1460 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1321 else if (w->interval) 1461 else if (w->interval)
1322 { 1462 {
1323 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.));
1324 /* 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 */
1325 ((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;
1326 } 1466 }
1327 1467
1328 ev_start (EV_A_ (W)w, ++periodiccnt); 1468 ev_start (EV_A_ (W)w, ++periodiccnt);
1329 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1469 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1330 periodics [periodiccnt - 1] = w; 1470 periodics [periodiccnt - 1] = w;
1331 upheap ((WT *)periodics, periodiccnt - 1); 1471 upheap ((WT *)periodics, periodiccnt - 1);
1332 1472
1333 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1473 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1334} 1474}
1335 1475
1336void 1476void
1337ev_periodic_stop (EV_P_ struct ev_periodic *w) 1477ev_periodic_stop (EV_P_ struct ev_periodic *w)
1338{ 1478{
1339 ev_clear_pending (EV_A_ (W)w); 1479 ev_clear_pending (EV_A_ (W)w);
1340 if (!ev_is_active (w)) 1480 if (expect_false (!ev_is_active (w)))
1341 return; 1481 return;
1342 1482
1343 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1483 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1344 1484
1345 if (((W)w)->active < periodiccnt--) 1485 if (expect_true (((W)w)->active < periodiccnt--))
1346 { 1486 {
1347 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1487 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1348 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1488 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1349 } 1489 }
1350 1490
1351 ev_stop (EV_A_ (W)w); 1491 ev_stop (EV_A_ (W)w);
1352} 1492}
1353 1493
1354void 1494void
1355ev_periodic_again (EV_P_ struct ev_periodic *w) 1495ev_periodic_again (EV_P_ struct ev_periodic *w)
1356{ 1496{
1497 /* TODO: use adjustheap and recalculation */
1357 ev_periodic_stop (EV_A_ w); 1498 ev_periodic_stop (EV_A_ w);
1358 ev_periodic_start (EV_A_ w); 1499 ev_periodic_start (EV_A_ w);
1359} 1500}
1501#endif
1360 1502
1361void 1503void
1362ev_idle_start (EV_P_ struct ev_idle *w) 1504ev_idle_start (EV_P_ struct ev_idle *w)
1363{ 1505{
1364 if (ev_is_active (w)) 1506 if (expect_false (ev_is_active (w)))
1365 return; 1507 return;
1366 1508
1367 ev_start (EV_A_ (W)w, ++idlecnt); 1509 ev_start (EV_A_ (W)w, ++idlecnt);
1368 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1510 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1369 idles [idlecnt - 1] = w; 1511 idles [idlecnt - 1] = w;
1370} 1512}
1371 1513
1372void 1514void
1373ev_idle_stop (EV_P_ struct ev_idle *w) 1515ev_idle_stop (EV_P_ struct ev_idle *w)
1374{ 1516{
1375 ev_clear_pending (EV_A_ (W)w); 1517 ev_clear_pending (EV_A_ (W)w);
1376 if (ev_is_active (w)) 1518 if (expect_false (!ev_is_active (w)))
1377 return; 1519 return;
1378 1520
1379 idles [((W)w)->active - 1] = idles [--idlecnt]; 1521 idles [((W)w)->active - 1] = idles [--idlecnt];
1380 ev_stop (EV_A_ (W)w); 1522 ev_stop (EV_A_ (W)w);
1381} 1523}
1382 1524
1383void 1525void
1384ev_prepare_start (EV_P_ struct ev_prepare *w) 1526ev_prepare_start (EV_P_ struct ev_prepare *w)
1385{ 1527{
1386 if (ev_is_active (w)) 1528 if (expect_false (ev_is_active (w)))
1387 return; 1529 return;
1388 1530
1389 ev_start (EV_A_ (W)w, ++preparecnt); 1531 ev_start (EV_A_ (W)w, ++preparecnt);
1390 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1532 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1391 prepares [preparecnt - 1] = w; 1533 prepares [preparecnt - 1] = w;
1392} 1534}
1393 1535
1394void 1536void
1395ev_prepare_stop (EV_P_ struct ev_prepare *w) 1537ev_prepare_stop (EV_P_ struct ev_prepare *w)
1396{ 1538{
1397 ev_clear_pending (EV_A_ (W)w); 1539 ev_clear_pending (EV_A_ (W)w);
1398 if (ev_is_active (w)) 1540 if (expect_false (!ev_is_active (w)))
1399 return; 1541 return;
1400 1542
1401 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1543 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1402 ev_stop (EV_A_ (W)w); 1544 ev_stop (EV_A_ (W)w);
1403} 1545}
1404 1546
1405void 1547void
1406ev_check_start (EV_P_ struct ev_check *w) 1548ev_check_start (EV_P_ struct ev_check *w)
1407{ 1549{
1408 if (ev_is_active (w)) 1550 if (expect_false (ev_is_active (w)))
1409 return; 1551 return;
1410 1552
1411 ev_start (EV_A_ (W)w, ++checkcnt); 1553 ev_start (EV_A_ (W)w, ++checkcnt);
1412 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1554 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1413 checks [checkcnt - 1] = w; 1555 checks [checkcnt - 1] = w;
1414} 1556}
1415 1557
1416void 1558void
1417ev_check_stop (EV_P_ struct ev_check *w) 1559ev_check_stop (EV_P_ struct ev_check *w)
1418{ 1560{
1419 ev_clear_pending (EV_A_ (W)w); 1561 ev_clear_pending (EV_A_ (W)w);
1420 if (ev_is_active (w)) 1562 if (expect_false (!ev_is_active (w)))
1421 return; 1563 return;
1422 1564
1423 checks [((W)w)->active - 1] = checks [--checkcnt]; 1565 checks [((W)w)->active - 1] = checks [--checkcnt];
1424 ev_stop (EV_A_ (W)w); 1566 ev_stop (EV_A_ (W)w);
1425} 1567}
… …
1430 1572
1431void 1573void
1432ev_signal_start (EV_P_ struct ev_signal *w) 1574ev_signal_start (EV_P_ struct ev_signal *w)
1433{ 1575{
1434#if EV_MULTIPLICITY 1576#if EV_MULTIPLICITY
1435 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));
1436#endif 1578#endif
1437 if (ev_is_active (w)) 1579 if (expect_false (ev_is_active (w)))
1438 return; 1580 return;
1439 1581
1440 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));
1441 1583
1442 ev_start (EV_A_ (W)w, 1); 1584 ev_start (EV_A_ (W)w, 1);
1443 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1585 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1444 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1586 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1445 1587
1446 if (!((WL)w)->next) 1588 if (!((WL)w)->next)
1447 { 1589 {
1448#if WIN32 1590#if _WIN32
1449 signal (w->signum, sighandler); 1591 signal (w->signum, sighandler);
1450#else 1592#else
1451 struct sigaction sa; 1593 struct sigaction sa;
1452 sa.sa_handler = sighandler; 1594 sa.sa_handler = sighandler;
1453 sigfillset (&sa.sa_mask); 1595 sigfillset (&sa.sa_mask);
… …
1459 1601
1460void 1602void
1461ev_signal_stop (EV_P_ struct ev_signal *w) 1603ev_signal_stop (EV_P_ struct ev_signal *w)
1462{ 1604{
1463 ev_clear_pending (EV_A_ (W)w); 1605 ev_clear_pending (EV_A_ (W)w);
1464 if (!ev_is_active (w)) 1606 if (expect_false (!ev_is_active (w)))
1465 return; 1607 return;
1466 1608
1467 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1609 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1468 ev_stop (EV_A_ (W)w); 1610 ev_stop (EV_A_ (W)w);
1469 1611
… …
1473 1615
1474void 1616void
1475ev_child_start (EV_P_ struct ev_child *w) 1617ev_child_start (EV_P_ struct ev_child *w)
1476{ 1618{
1477#if EV_MULTIPLICITY 1619#if EV_MULTIPLICITY
1478 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));
1479#endif 1621#endif
1480 if (ev_is_active (w)) 1622 if (expect_false (ev_is_active (w)))
1481 return; 1623 return;
1482 1624
1483 ev_start (EV_A_ (W)w, 1); 1625 ev_start (EV_A_ (W)w, 1);
1484 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1626 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1485} 1627}
1486 1628
1487void 1629void
1488ev_child_stop (EV_P_ struct ev_child *w) 1630ev_child_stop (EV_P_ struct ev_child *w)
1489{ 1631{
1490 ev_clear_pending (EV_A_ (W)w); 1632 ev_clear_pending (EV_A_ (W)w);
1491 if (ev_is_active (w)) 1633 if (expect_false (!ev_is_active (w)))
1492 return; 1634 return;
1493 1635
1494 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1636 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1495 ev_stop (EV_A_ (W)w); 1637 ev_stop (EV_A_ (W)w);
1496} 1638}
… …
1533void 1675void
1534ev_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)
1535{ 1677{
1536 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));
1537 1679
1538 if (!once) 1680 if (expect_false (!once))
1681 {
1539 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1682 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1540 else 1683 return;
1541 { 1684 }
1685
1542 once->cb = cb; 1686 once->cb = cb;
1543 once->arg = arg; 1687 once->arg = arg;
1544 1688
1545 ev_watcher_init (&once->io, once_cb_io); 1689 ev_init (&once->io, once_cb_io);
1546 if (fd >= 0) 1690 if (fd >= 0)
1547 { 1691 {
1548 ev_io_set (&once->io, fd, events); 1692 ev_io_set (&once->io, fd, events);
1549 ev_io_start (EV_A_ &once->io); 1693 ev_io_start (EV_A_ &once->io);
1550 } 1694 }
1551 1695
1552 ev_watcher_init (&once->to, once_cb_to); 1696 ev_init (&once->to, once_cb_to);
1553 if (timeout >= 0.) 1697 if (timeout >= 0.)
1554 { 1698 {
1555 ev_timer_set (&once->to, timeout, 0.); 1699 ev_timer_set (&once->to, timeout, 0.);
1556 ev_timer_start (EV_A_ &once->to); 1700 ev_timer_start (EV_A_ &once->to);
1557 }
1558 } 1701 }
1559} 1702}
1560 1703
1704#ifdef __cplusplus
1705}
1706#endif
1707

Diff Legend

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