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

Comparing libev/ev.c (file contents):
Revision 1.74 by root, Tue Nov 6 16:51:20 2007 UTC vs.
Revision 1.130 by root, Fri Nov 23 05:13:48 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/**/
113 158
114#ifndef CLOCK_MONOTONIC 159#ifndef CLOCK_MONOTONIC
119#ifndef CLOCK_REALTIME 164#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 165# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 166# define EV_USE_REALTIME 0
122#endif 167#endif
123 168
169#if EV_SELECT_IS_WINSOCKET
170# include <winsock.h>
171#endif
172
124/**/ 173/**/
125 174
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 175#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) */ 176#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 */ 177#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 */ 178/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
130 179
180#ifdef EV_H
181# include EV_H
182#else
131#include "ev.h" 183# include "ev.h"
184#endif
132 185
133#if __GNUC__ >= 3 186#if __GNUC__ >= 3
134# define expect(expr,value) __builtin_expect ((expr),(value)) 187# define expect(expr,value) __builtin_expect ((expr),(value))
135# define inline inline 188# define inline static inline
136#else 189#else
137# define expect(expr,value) (expr) 190# define expect(expr,value) (expr)
138# define inline static 191# define inline static
139#endif 192#endif
140 193
142#define expect_true(expr) expect ((expr) != 0, 1) 195#define expect_true(expr) expect ((expr) != 0, 1)
143 196
144#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 197#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
145#define ABSPRI(w) ((w)->priority - EV_MINPRI) 198#define ABSPRI(w) ((w)->priority - EV_MINPRI)
146 199
200#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
201#define EMPTY2(a,b) /* used to suppress some warnings */
202
147typedef struct ev_watcher *W; 203typedef struct ev_watcher *W;
148typedef struct ev_watcher_list *WL; 204typedef struct ev_watcher_list *WL;
149typedef struct ev_watcher_time *WT; 205typedef struct ev_watcher_time *WT;
150 206
151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 207static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
152 208
209#ifdef _WIN32
153#include "ev_win32.c" 210# include "ev_win32.c"
211#endif
154 212
155/*****************************************************************************/ 213/*****************************************************************************/
156 214
157static void (*syserr_cb)(const char *msg); 215static void (*syserr_cb)(const char *msg);
158 216
205typedef struct 263typedef struct
206{ 264{
207 WL head; 265 WL head;
208 unsigned char events; 266 unsigned char events;
209 unsigned char reify; 267 unsigned char reify;
268#if EV_SELECT_IS_WINSOCKET
269 SOCKET handle;
270#endif
210} ANFD; 271} ANFD;
211 272
212typedef struct 273typedef struct
213{ 274{
214 W w; 275 W w;
215 int events; 276 int events;
216} ANPENDING; 277} ANPENDING;
217 278
218#if EV_MULTIPLICITY 279#if EV_MULTIPLICITY
219 280
220struct ev_loop 281 struct ev_loop
221{ 282 {
283 ev_tstamp ev_rt_now;
284 #define ev_rt_now ((loop)->ev_rt_now)
222# define VAR(name,decl) decl; 285 #define VAR(name,decl) decl;
223# include "ev_vars.h" 286 #include "ev_vars.h"
224};
225# undef VAR 287 #undef VAR
288 };
226# include "ev_wrap.h" 289 #include "ev_wrap.h"
290
291 static struct ev_loop default_loop_struct;
292 struct ev_loop *ev_default_loop_ptr;
227 293
228#else 294#else
229 295
296 ev_tstamp ev_rt_now;
230# define VAR(name,decl) static decl; 297 #define VAR(name,decl) static decl;
231# include "ev_vars.h" 298 #include "ev_vars.h"
232# undef VAR 299 #undef VAR
300
301 static int ev_default_loop_ptr;
233 302
234#endif 303#endif
235 304
236/*****************************************************************************/ 305/*****************************************************************************/
237 306
238inline ev_tstamp 307ev_tstamp
239ev_time (void) 308ev_time (void)
240{ 309{
241#if EV_USE_REALTIME 310#if EV_USE_REALTIME
242 struct timespec ts; 311 struct timespec ts;
243 clock_gettime (CLOCK_REALTIME, &ts); 312 clock_gettime (CLOCK_REALTIME, &ts);
262#endif 331#endif
263 332
264 return ev_time (); 333 return ev_time ();
265} 334}
266 335
336#if EV_MULTIPLICITY
267ev_tstamp 337ev_tstamp
268ev_now (EV_P) 338ev_now (EV_P)
269{ 339{
270 return rt_now; 340 return ev_rt_now;
271} 341}
342#endif
272 343
273#define array_roundsize(type,n) ((n) | 4 & ~3) 344#define array_roundsize(type,n) (((n) | 4) & ~3)
274 345
275#define array_needsize(type,base,cur,cnt,init) \ 346#define array_needsize(type,base,cur,cnt,init) \
276 if (expect_false ((cnt) > cur)) \ 347 if (expect_false ((cnt) > cur)) \
277 { \ 348 { \
278 int newcnt = cur; \ 349 int newcnt = cur; \
293 stem ## max = array_roundsize (stem ## cnt >> 1); \ 364 stem ## max = array_roundsize (stem ## cnt >> 1); \
294 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 365 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
295 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 366 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
296 } 367 }
297 368
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) \ 369#define array_free(stem, idx) \
304 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 370 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
305 371
306/*****************************************************************************/ 372/*****************************************************************************/
307 373
316 382
317 ++base; 383 ++base;
318 } 384 }
319} 385}
320 386
321static void 387void
322event (EV_P_ W w, int events) 388ev_feed_event (EV_P_ void *w, int revents)
323{ 389{
324 if (w->pending) 390 W w_ = (W)w;
391
392 if (expect_false (w_->pending))
325 { 393 {
326 pendings [ABSPRI (w)][w->pending - 1].events |= events; 394 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
327 return; 395 return;
328 } 396 }
329 397
330 w->pending = ++pendingcnt [ABSPRI (w)]; 398 w_->pending = ++pendingcnt [ABSPRI (w_)];
331 array_needsize (ANPENDING, pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], (void)); 399 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
332 pendings [ABSPRI (w)][w->pending - 1].w = w; 400 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
333 pendings [ABSPRI (w)][w->pending - 1].events = events; 401 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
334} 402}
335 403
336static void 404static void
337queue_events (EV_P_ W *events, int eventcnt, int type) 405queue_events (EV_P_ W *events, int eventcnt, int type)
338{ 406{
339 int i; 407 int i;
340 408
341 for (i = 0; i < eventcnt; ++i) 409 for (i = 0; i < eventcnt; ++i)
342 event (EV_A_ events [i], type); 410 ev_feed_event (EV_A_ events [i], type);
343} 411}
344 412
345static void 413inline void
346fd_event (EV_P_ int fd, int events) 414fd_event (EV_P_ int fd, int revents)
347{ 415{
348 ANFD *anfd = anfds + fd; 416 ANFD *anfd = anfds + fd;
349 struct ev_io *w; 417 struct ev_io *w;
350 418
351 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 419 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
352 { 420 {
353 int ev = w->events & events; 421 int ev = w->events & revents;
354 422
355 if (ev) 423 if (ev)
356 event (EV_A_ (W)w, ev); 424 ev_feed_event (EV_A_ (W)w, ev);
357 } 425 }
426}
427
428void
429ev_feed_fd_event (EV_P_ int fd, int revents)
430{
431 fd_event (EV_A_ fd, revents);
358} 432}
359 433
360/*****************************************************************************/ 434/*****************************************************************************/
361 435
362static void 436inline void
363fd_reify (EV_P) 437fd_reify (EV_P)
364{ 438{
365 int i; 439 int i;
366 440
367 for (i = 0; i < fdchangecnt; ++i) 441 for (i = 0; i < fdchangecnt; ++i)
373 int events = 0; 447 int events = 0;
374 448
375 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 449 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
376 events |= w->events; 450 events |= w->events;
377 451
452#if EV_SELECT_IS_WINSOCKET
453 if (events)
454 {
455 unsigned long argp;
456 anfd->handle = _get_osfhandle (fd);
457 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
458 }
459#endif
460
378 anfd->reify = 0; 461 anfd->reify = 0;
379 462
380 method_modify (EV_A_ fd, anfd->events, events); 463 backend_modify (EV_A_ fd, anfd->events, events);
381 anfd->events = events; 464 anfd->events = events;
382 } 465 }
383 466
384 fdchangecnt = 0; 467 fdchangecnt = 0;
385} 468}
386 469
387static void 470static void
388fd_change (EV_P_ int fd) 471fd_change (EV_P_ int fd)
389{ 472{
390 if (anfds [fd].reify) 473 if (expect_false (anfds [fd].reify))
391 return; 474 return;
392 475
393 anfds [fd].reify = 1; 476 anfds [fd].reify = 1;
394 477
395 ++fdchangecnt; 478 ++fdchangecnt;
396 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 479 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
397 fdchanges [fdchangecnt - 1] = fd; 480 fdchanges [fdchangecnt - 1] = fd;
398} 481}
399 482
400static void 483static void
401fd_kill (EV_P_ int fd) 484fd_kill (EV_P_ int fd)
403 struct ev_io *w; 486 struct ev_io *w;
404 487
405 while ((w = (struct ev_io *)anfds [fd].head)) 488 while ((w = (struct ev_io *)anfds [fd].head))
406 { 489 {
407 ev_io_stop (EV_A_ w); 490 ev_io_stop (EV_A_ w);
408 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 491 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
409 } 492 }
410} 493}
411 494
412static int 495inline int
413fd_valid (int fd) 496fd_valid (int fd)
414{ 497{
415#ifdef WIN32 498#ifdef _WIN32
416 return !!win32_get_osfhandle (fd); 499 return _get_osfhandle (fd) != -1;
417#else 500#else
418 return fcntl (fd, F_GETFD) != -1; 501 return fcntl (fd, F_GETFD) != -1;
419#endif 502#endif
420} 503}
421 504
443 fd_kill (EV_A_ fd); 526 fd_kill (EV_A_ fd);
444 return; 527 return;
445 } 528 }
446} 529}
447 530
448/* usually called after fork if method needs to re-arm all fds from scratch */ 531/* usually called after fork if backend needs to re-arm all fds from scratch */
449static void 532static void
450fd_rearm_all (EV_P) 533fd_rearm_all (EV_P)
451{ 534{
452 int fd; 535 int fd;
453 536
501 584
502 heap [k] = w; 585 heap [k] = w;
503 ((W)heap [k])->active = k + 1; 586 ((W)heap [k])->active = k + 1;
504} 587}
505 588
589inline void
590adjustheap (WT *heap, int N, int k)
591{
592 upheap (heap, k);
593 downheap (heap, N, k);
594}
595
506/*****************************************************************************/ 596/*****************************************************************************/
507 597
508typedef struct 598typedef struct
509{ 599{
510 WL head; 600 WL head;
531} 621}
532 622
533static void 623static void
534sighandler (int signum) 624sighandler (int signum)
535{ 625{
536#if WIN32 626#if _WIN32
537 signal (signum, sighandler); 627 signal (signum, sighandler);
538#endif 628#endif
539 629
540 signals [signum - 1].gotsig = 1; 630 signals [signum - 1].gotsig = 1;
541 631
546 write (sigpipe [1], &signum, 1); 636 write (sigpipe [1], &signum, 1);
547 errno = old_errno; 637 errno = old_errno;
548 } 638 }
549} 639}
550 640
641void
642ev_feed_signal_event (EV_P_ int signum)
643{
644 WL w;
645
646#if EV_MULTIPLICITY
647 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
648#endif
649
650 --signum;
651
652 if (signum < 0 || signum >= signalmax)
653 return;
654
655 signals [signum].gotsig = 0;
656
657 for (w = signals [signum].head; w; w = w->next)
658 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
659}
660
551static void 661static void
552sigcb (EV_P_ struct ev_io *iow, int revents) 662sigcb (EV_P_ struct ev_io *iow, int revents)
553{ 663{
554 WL w;
555 int signum; 664 int signum;
556 665
557 read (sigpipe [0], &revents, 1); 666 read (sigpipe [0], &revents, 1);
558 gotsig = 0; 667 gotsig = 0;
559 668
560 for (signum = signalmax; signum--; ) 669 for (signum = signalmax; signum--; )
561 if (signals [signum].gotsig) 670 if (signals [signum].gotsig)
562 { 671 ev_feed_signal_event (EV_A_ signum + 1);
563 signals [signum].gotsig = 0; 672}
564 673
565 for (w = signals [signum].head; w; w = w->next) 674static void
566 event (EV_A_ (W)w, EV_SIGNAL); 675fd_intern (int fd)
567 } 676{
677#ifdef _WIN32
678 int arg = 1;
679 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
680#else
681 fcntl (fd, F_SETFD, FD_CLOEXEC);
682 fcntl (fd, F_SETFL, O_NONBLOCK);
683#endif
568} 684}
569 685
570static void 686static void
571siginit (EV_P) 687siginit (EV_P)
572{ 688{
573#ifndef WIN32 689 fd_intern (sigpipe [0]);
574 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 690 fd_intern (sigpipe [1]);
575 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
576
577 /* rather than sort out wether we really need nb, set it */
578 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
579 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
580#endif
581 691
582 ev_io_set (&sigev, sigpipe [0], EV_READ); 692 ev_io_set (&sigev, sigpipe [0], EV_READ);
583 ev_io_start (EV_A_ &sigev); 693 ev_io_start (EV_A_ &sigev);
584 ev_unref (EV_A); /* child watcher should not keep loop alive */ 694 ev_unref (EV_A); /* child watcher should not keep loop alive */
585} 695}
586 696
587/*****************************************************************************/ 697/*****************************************************************************/
588 698
589static struct ev_child *childs [PID_HASHSIZE]; 699static struct ev_child *childs [PID_HASHSIZE];
590 700
591#ifndef WIN32 701#ifndef _WIN32
592 702
593static struct ev_signal childev; 703static struct ev_signal childev;
594 704
595#ifndef WCONTINUED 705#ifndef WCONTINUED
596# define WCONTINUED 0 706# define WCONTINUED 0
605 if (w->pid == pid || !w->pid) 715 if (w->pid == pid || !w->pid)
606 { 716 {
607 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 717 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
608 w->rpid = pid; 718 w->rpid = pid;
609 w->rstatus = status; 719 w->rstatus = status;
610 event (EV_A_ (W)w, EV_CHILD); 720 ev_feed_event (EV_A_ (W)w, EV_CHILD);
611 } 721 }
612} 722}
613 723
614static void 724static void
615childcb (EV_P_ struct ev_signal *sw, int revents) 725childcb (EV_P_ struct ev_signal *sw, int revents)
617 int pid, status; 727 int pid, status;
618 728
619 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 729 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
620 { 730 {
621 /* make sure we are called again until all childs have been reaped */ 731 /* make sure we are called again until all childs have been reaped */
622 event (EV_A_ (W)sw, EV_SIGNAL); 732 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
623 733
624 child_reap (EV_A_ sw, pid, pid, status); 734 child_reap (EV_A_ sw, pid, pid, status);
625 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 735 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
626 } 736 }
627} 737}
628 738
629#endif 739#endif
630 740
631/*****************************************************************************/ 741/*****************************************************************************/
632 742
743#if EV_USE_PORT
744# include "ev_port.c"
745#endif
633#if EV_USE_KQUEUE 746#if EV_USE_KQUEUE
634# include "ev_kqueue.c" 747# include "ev_kqueue.c"
635#endif 748#endif
636#if EV_USE_EPOLL 749#if EV_USE_EPOLL
637# include "ev_epoll.c" 750# include "ev_epoll.c"
657 770
658/* return true if we are running with elevated privileges and should ignore env variables */ 771/* return true if we are running with elevated privileges and should ignore env variables */
659static int 772static int
660enable_secure (void) 773enable_secure (void)
661{ 774{
662#ifdef WIN32 775#ifdef _WIN32
663 return 0; 776 return 0;
664#else 777#else
665 return getuid () != geteuid () 778 return getuid () != geteuid ()
666 || getgid () != getegid (); 779 || getgid () != getegid ();
667#endif 780#endif
668} 781}
669 782
670int 783unsigned int
671ev_method (EV_P) 784ev_supported_backends (void)
672{ 785{
673 return method; 786 unsigned int flags = 0;
674}
675 787
676static void 788 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
677loop_init (EV_P_ int methods) 789 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
790 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
791 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
792 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
793
794 return flags;
795}
796
797unsigned int
798ev_recommended_backends (void)
678{ 799{
679 if (!method) 800 unsigned int flags = ev_recommended_backends ();
801
802#ifndef __NetBSD__
803 /* kqueue is borked on everything but netbsd apparently */
804 /* it usually doesn't work correctly on anything but sockets and pipes */
805 flags &= ~EVBACKEND_KQUEUE;
806#endif
807#ifdef __APPLE__
808 // flags &= ~EVBACKEND_KQUEUE; for documentation
809 flags &= ~EVBACKEND_POLL;
810#endif
811
812 return flags;
813}
814
815unsigned int
816ev_backend (EV_P)
817{
818 return backend;
819}
820
821static void
822loop_init (EV_P_ unsigned int flags)
823{
824 if (!backend)
680 { 825 {
681#if EV_USE_MONOTONIC 826#if EV_USE_MONOTONIC
682 { 827 {
683 struct timespec ts; 828 struct timespec ts;
684 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 829 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
685 have_monotonic = 1; 830 have_monotonic = 1;
686 } 831 }
687#endif 832#endif
688 833
689 rt_now = ev_time (); 834 ev_rt_now = ev_time ();
690 mn_now = get_clock (); 835 mn_now = get_clock ();
691 now_floor = mn_now; 836 now_floor = mn_now;
692 rtmn_diff = rt_now - mn_now; 837 rtmn_diff = ev_rt_now - mn_now;
693 838
694 if (methods == EVMETHOD_AUTO) 839 if (!(flags & EVFLAG_NOENV)
695 if (!enable_secure () && getenv ("LIBEV_METHODS")) 840 && !enable_secure ()
841 && getenv ("LIBEV_FLAGS"))
696 methods = atoi (getenv ("LIBEV_METHODS")); 842 flags = atoi (getenv ("LIBEV_FLAGS"));
697 else
698 methods = EVMETHOD_ANY;
699 843
700 method = 0; 844 if (!(flags & 0x0000ffffUL))
701#if EV_USE_WIN32 845 flags |= ev_recommended_backends ();
702 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 846
847 backend = 0;
848#if EV_USE_PORT
849 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
703#endif 850#endif
704#if EV_USE_KQUEUE 851#if EV_USE_KQUEUE
705 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 852 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
706#endif 853#endif
707#if EV_USE_EPOLL 854#if EV_USE_EPOLL
708 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 855 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
709#endif 856#endif
710#if EV_USE_POLL 857#if EV_USE_POLL
711 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 858 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
712#endif 859#endif
713#if EV_USE_SELECT 860#if EV_USE_SELECT
714 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 861 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
715#endif 862#endif
716 863
717 ev_watcher_init (&sigev, sigcb); 864 ev_init (&sigev, sigcb);
718 ev_set_priority (&sigev, EV_MAXPRI); 865 ev_set_priority (&sigev, EV_MAXPRI);
719 } 866 }
720} 867}
721 868
722void 869static void
723loop_destroy (EV_P) 870loop_destroy (EV_P)
724{ 871{
725 int i; 872 int i;
726 873
727#if EV_USE_WIN32 874#if EV_USE_PORT
728 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 875 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
729#endif 876#endif
730#if EV_USE_KQUEUE 877#if EV_USE_KQUEUE
731 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 878 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
732#endif 879#endif
733#if EV_USE_EPOLL 880#if EV_USE_EPOLL
734 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 881 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
735#endif 882#endif
736#if EV_USE_POLL 883#if EV_USE_POLL
737 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 884 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
738#endif 885#endif
739#if EV_USE_SELECT 886#if EV_USE_SELECT
740 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 887 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
741#endif 888#endif
742 889
743 for (i = NUMPRI; i--; ) 890 for (i = NUMPRI; i--; )
744 array_free (pending, [i]); 891 array_free (pending, [i]);
745 892
746 /* have to use the microsoft-never-gets-it-right macro */ 893 /* have to use the microsoft-never-gets-it-right macro */
747 array_free_microshit (fdchange); 894 array_free (fdchange, EMPTY0);
748 array_free_microshit (timer); 895 array_free (timer, EMPTY0);
749 array_free_microshit (periodic); 896#if EV_PERIODICS
750 array_free_microshit (idle); 897 array_free (periodic, EMPTY0);
751 array_free_microshit (prepare); 898#endif
752 array_free_microshit (check); 899 array_free (idle, EMPTY0);
900 array_free (prepare, EMPTY0);
901 array_free (check, EMPTY0);
753 902
754 method = 0; 903 backend = 0;
755} 904}
756 905
757static void 906static void
758loop_fork (EV_P) 907loop_fork (EV_P)
759{ 908{
909#if EV_USE_PORT
910 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
911#endif
912#if EV_USE_KQUEUE
913 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
914#endif
760#if EV_USE_EPOLL 915#if EV_USE_EPOLL
761 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 916 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
762#endif
763#if EV_USE_KQUEUE
764 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
765#endif 917#endif
766 918
767 if (ev_is_active (&sigev)) 919 if (ev_is_active (&sigev))
768 { 920 {
769 /* default loop */ 921 /* default loop */
782 postfork = 0; 934 postfork = 0;
783} 935}
784 936
785#if EV_MULTIPLICITY 937#if EV_MULTIPLICITY
786struct ev_loop * 938struct ev_loop *
787ev_loop_new (int methods) 939ev_loop_new (unsigned int flags)
788{ 940{
789 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 941 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
790 942
791 memset (loop, 0, sizeof (struct ev_loop)); 943 memset (loop, 0, sizeof (struct ev_loop));
792 944
793 loop_init (EV_A_ methods); 945 loop_init (EV_A_ flags);
794 946
795 if (ev_method (EV_A)) 947 if (ev_backend (EV_A))
796 return loop; 948 return loop;
797 949
798 return 0; 950 return 0;
799} 951}
800 952
812} 964}
813 965
814#endif 966#endif
815 967
816#if EV_MULTIPLICITY 968#if EV_MULTIPLICITY
817struct ev_loop default_loop_struct;
818static struct ev_loop *default_loop;
819
820struct ev_loop * 969struct ev_loop *
970ev_default_loop_init (unsigned int flags)
821#else 971#else
822static int default_loop;
823
824int 972int
973ev_default_loop (unsigned int flags)
825#endif 974#endif
826ev_default_loop (int methods)
827{ 975{
828 if (sigpipe [0] == sigpipe [1]) 976 if (sigpipe [0] == sigpipe [1])
829 if (pipe (sigpipe)) 977 if (pipe (sigpipe))
830 return 0; 978 return 0;
831 979
832 if (!default_loop) 980 if (!ev_default_loop_ptr)
833 { 981 {
834#if EV_MULTIPLICITY 982#if EV_MULTIPLICITY
835 struct ev_loop *loop = default_loop = &default_loop_struct; 983 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
836#else 984#else
837 default_loop = 1; 985 ev_default_loop_ptr = 1;
838#endif 986#endif
839 987
840 loop_init (EV_A_ methods); 988 loop_init (EV_A_ flags);
841 989
842 if (ev_method (EV_A)) 990 if (ev_backend (EV_A))
843 { 991 {
844 siginit (EV_A); 992 siginit (EV_A);
845 993
846#ifndef WIN32 994#ifndef _WIN32
847 ev_signal_init (&childev, childcb, SIGCHLD); 995 ev_signal_init (&childev, childcb, SIGCHLD);
848 ev_set_priority (&childev, EV_MAXPRI); 996 ev_set_priority (&childev, EV_MAXPRI);
849 ev_signal_start (EV_A_ &childev); 997 ev_signal_start (EV_A_ &childev);
850 ev_unref (EV_A); /* child watcher should not keep loop alive */ 998 ev_unref (EV_A); /* child watcher should not keep loop alive */
851#endif 999#endif
852 } 1000 }
853 else 1001 else
854 default_loop = 0; 1002 ev_default_loop_ptr = 0;
855 } 1003 }
856 1004
857 return default_loop; 1005 return ev_default_loop_ptr;
858} 1006}
859 1007
860void 1008void
861ev_default_destroy (void) 1009ev_default_destroy (void)
862{ 1010{
863#if EV_MULTIPLICITY 1011#if EV_MULTIPLICITY
864 struct ev_loop *loop = default_loop; 1012 struct ev_loop *loop = ev_default_loop_ptr;
865#endif 1013#endif
866 1014
867#ifndef WIN32 1015#ifndef _WIN32
868 ev_ref (EV_A); /* child watcher */ 1016 ev_ref (EV_A); /* child watcher */
869 ev_signal_stop (EV_A_ &childev); 1017 ev_signal_stop (EV_A_ &childev);
870#endif 1018#endif
871 1019
872 ev_ref (EV_A); /* signal watcher */ 1020 ev_ref (EV_A); /* signal watcher */
880 1028
881void 1029void
882ev_default_fork (void) 1030ev_default_fork (void)
883{ 1031{
884#if EV_MULTIPLICITY 1032#if EV_MULTIPLICITY
885 struct ev_loop *loop = default_loop; 1033 struct ev_loop *loop = ev_default_loop_ptr;
886#endif 1034#endif
887 1035
888 if (method) 1036 if (backend)
889 postfork = 1; 1037 postfork = 1;
890} 1038}
891 1039
892/*****************************************************************************/ 1040/*****************************************************************************/
893 1041
894static void 1042static int
1043any_pending (EV_P)
1044{
1045 int pri;
1046
1047 for (pri = NUMPRI; pri--; )
1048 if (pendingcnt [pri])
1049 return 1;
1050
1051 return 0;
1052}
1053
1054inline void
895call_pending (EV_P) 1055call_pending (EV_P)
896{ 1056{
897 int pri; 1057 int pri;
898 1058
899 for (pri = NUMPRI; pri--; ) 1059 for (pri = NUMPRI; pri--; )
900 while (pendingcnt [pri]) 1060 while (pendingcnt [pri])
901 { 1061 {
902 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1062 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
903 1063
904 if (p->w) 1064 if (expect_true (p->w))
905 { 1065 {
906 p->w->pending = 0; 1066 p->w->pending = 0;
907 p->w->cb (EV_A_ p->w, p->events); 1067 EV_CB_INVOKE (p->w, p->events);
908 } 1068 }
909 } 1069 }
910} 1070}
911 1071
912static void 1072inline void
913timers_reify (EV_P) 1073timers_reify (EV_P)
914{ 1074{
915 while (timercnt && ((WT)timers [0])->at <= mn_now) 1075 while (timercnt && ((WT)timers [0])->at <= mn_now)
916 { 1076 {
917 struct ev_timer *w = timers [0]; 1077 struct ev_timer *w = timers [0];
920 1080
921 /* first reschedule or stop timer */ 1081 /* first reschedule or stop timer */
922 if (w->repeat) 1082 if (w->repeat)
923 { 1083 {
924 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1084 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1085
925 ((WT)w)->at = mn_now + w->repeat; 1086 ((WT)w)->at += w->repeat;
1087 if (((WT)w)->at < mn_now)
1088 ((WT)w)->at = mn_now;
1089
926 downheap ((WT *)timers, timercnt, 0); 1090 downheap ((WT *)timers, timercnt, 0);
927 } 1091 }
928 else 1092 else
929 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1093 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
930 1094
931 event (EV_A_ (W)w, EV_TIMEOUT); 1095 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
932 } 1096 }
933} 1097}
934 1098
935static void 1099#if EV_PERIODICS
1100inline void
936periodics_reify (EV_P) 1101periodics_reify (EV_P)
937{ 1102{
938 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1103 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
939 { 1104 {
940 struct ev_periodic *w = periodics [0]; 1105 struct ev_periodic *w = periodics [0];
941 1106
942 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1107 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
943 1108
944 /* first reschedule or stop timer */ 1109 /* first reschedule or stop timer */
945 if (w->interval) 1110 if (w->reschedule_cb)
946 { 1111 {
1112 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1113 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1114 downheap ((WT *)periodics, periodiccnt, 0);
1115 }
1116 else if (w->interval)
1117 {
947 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1118 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
948 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1119 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
949 downheap ((WT *)periodics, periodiccnt, 0); 1120 downheap ((WT *)periodics, periodiccnt, 0);
950 } 1121 }
951 else 1122 else
952 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1123 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
953 1124
954 event (EV_A_ (W)w, EV_PERIODIC); 1125 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
955 } 1126 }
956} 1127}
957 1128
958static void 1129static void
959periodics_reschedule (EV_P) 1130periodics_reschedule (EV_P)
963 /* adjust periodics after time jump */ 1134 /* adjust periodics after time jump */
964 for (i = 0; i < periodiccnt; ++i) 1135 for (i = 0; i < periodiccnt; ++i)
965 { 1136 {
966 struct ev_periodic *w = periodics [i]; 1137 struct ev_periodic *w = periodics [i];
967 1138
1139 if (w->reschedule_cb)
1140 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
968 if (w->interval) 1141 else if (w->interval)
969 {
970 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1142 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
971
972 if (fabs (diff) >= 1e-4)
973 {
974 ev_periodic_stop (EV_A_ w);
975 ev_periodic_start (EV_A_ w);
976
977 i = 0; /* restart loop, inefficient, but time jumps should be rare */
978 }
979 }
980 } 1143 }
1144
1145 /* now rebuild the heap */
1146 for (i = periodiccnt >> 1; i--; )
1147 downheap ((WT *)periodics, periodiccnt, i);
981} 1148}
1149#endif
982 1150
983inline int 1151inline int
984time_update_monotonic (EV_P) 1152time_update_monotonic (EV_P)
985{ 1153{
986 mn_now = get_clock (); 1154 mn_now = get_clock ();
987 1155
988 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1156 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
989 { 1157 {
990 rt_now = rtmn_diff + mn_now; 1158 ev_rt_now = rtmn_diff + mn_now;
991 return 0; 1159 return 0;
992 } 1160 }
993 else 1161 else
994 { 1162 {
995 now_floor = mn_now; 1163 now_floor = mn_now;
996 rt_now = ev_time (); 1164 ev_rt_now = ev_time ();
997 return 1; 1165 return 1;
998 } 1166 }
999} 1167}
1000 1168
1001static void 1169inline void
1002time_update (EV_P) 1170time_update (EV_P)
1003{ 1171{
1004 int i; 1172 int i;
1005 1173
1006#if EV_USE_MONOTONIC 1174#if EV_USE_MONOTONIC
1010 { 1178 {
1011 ev_tstamp odiff = rtmn_diff; 1179 ev_tstamp odiff = rtmn_diff;
1012 1180
1013 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1181 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1014 { 1182 {
1015 rtmn_diff = rt_now - mn_now; 1183 rtmn_diff = ev_rt_now - mn_now;
1016 1184
1017 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1185 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1018 return; /* all is well */ 1186 return; /* all is well */
1019 1187
1020 rt_now = ev_time (); 1188 ev_rt_now = ev_time ();
1021 mn_now = get_clock (); 1189 mn_now = get_clock ();
1022 now_floor = mn_now; 1190 now_floor = mn_now;
1023 } 1191 }
1024 1192
1193# if EV_PERIODICS
1025 periodics_reschedule (EV_A); 1194 periodics_reschedule (EV_A);
1195# endif
1026 /* no timer adjustment, as the monotonic clock doesn't jump */ 1196 /* no timer adjustment, as the monotonic clock doesn't jump */
1027 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1197 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1028 } 1198 }
1029 } 1199 }
1030 else 1200 else
1031#endif 1201#endif
1032 { 1202 {
1033 rt_now = ev_time (); 1203 ev_rt_now = ev_time ();
1034 1204
1035 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1205 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1036 { 1206 {
1207#if EV_PERIODICS
1037 periodics_reschedule (EV_A); 1208 periodics_reschedule (EV_A);
1209#endif
1038 1210
1039 /* adjust timers. this is easy, as the offset is the same for all */ 1211 /* adjust timers. this is easy, as the offset is the same for all */
1040 for (i = 0; i < timercnt; ++i) 1212 for (i = 0; i < timercnt; ++i)
1041 ((WT)timers [i])->at += rt_now - mn_now; 1213 ((WT)timers [i])->at += ev_rt_now - mn_now;
1042 } 1214 }
1043 1215
1044 mn_now = rt_now; 1216 mn_now = ev_rt_now;
1045 } 1217 }
1046} 1218}
1047 1219
1048void 1220void
1049ev_ref (EV_P) 1221ev_ref (EV_P)
1063ev_loop (EV_P_ int flags) 1235ev_loop (EV_P_ int flags)
1064{ 1236{
1065 double block; 1237 double block;
1066 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1238 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1067 1239
1068 do 1240 while (activecnt)
1069 { 1241 {
1070 /* queue check watchers (and execute them) */ 1242 /* queue check watchers (and execute them) */
1071 if (expect_false (preparecnt)) 1243 if (expect_false (preparecnt))
1072 { 1244 {
1073 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1245 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1081 /* update fd-related kernel structures */ 1253 /* update fd-related kernel structures */
1082 fd_reify (EV_A); 1254 fd_reify (EV_A);
1083 1255
1084 /* calculate blocking time */ 1256 /* calculate blocking time */
1085 1257
1086 /* we only need this for !monotonic clockor timers, but as we basically 1258 /* we only need this for !monotonic clock or timers, but as we basically
1087 always have timers, we just calculate it always */ 1259 always have timers, we just calculate it always */
1088#if EV_USE_MONOTONIC 1260#if EV_USE_MONOTONIC
1089 if (expect_true (have_monotonic)) 1261 if (expect_true (have_monotonic))
1090 time_update_monotonic (EV_A); 1262 time_update_monotonic (EV_A);
1091 else 1263 else
1092#endif 1264#endif
1093 { 1265 {
1094 rt_now = ev_time (); 1266 ev_rt_now = ev_time ();
1095 mn_now = rt_now; 1267 mn_now = ev_rt_now;
1096 } 1268 }
1097 1269
1098 if (flags & EVLOOP_NONBLOCK || idlecnt) 1270 if (flags & EVLOOP_NONBLOCK || idlecnt)
1099 block = 0.; 1271 block = 0.;
1100 else 1272 else
1101 { 1273 {
1102 block = MAX_BLOCKTIME; 1274 block = MAX_BLOCKTIME;
1103 1275
1104 if (timercnt) 1276 if (timercnt)
1105 { 1277 {
1106 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1278 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1107 if (block > to) block = to; 1279 if (block > to) block = to;
1108 } 1280 }
1109 1281
1282#if EV_PERIODICS
1110 if (periodiccnt) 1283 if (periodiccnt)
1111 { 1284 {
1112 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1285 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1113 if (block > to) block = to; 1286 if (block > to) block = to;
1114 } 1287 }
1288#endif
1115 1289
1116 if (block < 0.) block = 0.; 1290 if (expect_false (block < 0.)) block = 0.;
1117 } 1291 }
1118 1292
1119 method_poll (EV_A_ block); 1293 backend_poll (EV_A_ block);
1120 1294
1121 /* update rt_now, do magic */ 1295 /* update ev_rt_now, do magic */
1122 time_update (EV_A); 1296 time_update (EV_A);
1123 1297
1124 /* queue pending timers and reschedule them */ 1298 /* queue pending timers and reschedule them */
1125 timers_reify (EV_A); /* relative timers called last */ 1299 timers_reify (EV_A); /* relative timers called last */
1300#if EV_PERIODICS
1126 periodics_reify (EV_A); /* absolute timers called first */ 1301 periodics_reify (EV_A); /* absolute timers called first */
1302#endif
1127 1303
1128 /* queue idle watchers unless io or timers are pending */ 1304 /* queue idle watchers unless io or timers are pending */
1129 if (!pendingcnt) 1305 if (idlecnt && !any_pending (EV_A))
1130 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1306 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1131 1307
1132 /* queue check watchers, to be executed first */ 1308 /* queue check watchers, to be executed first */
1133 if (checkcnt) 1309 if (expect_false (checkcnt))
1134 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1310 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1135 1311
1136 call_pending (EV_A); 1312 call_pending (EV_A);
1313
1314 if (expect_false (loop_done))
1315 break;
1137 } 1316 }
1138 while (activecnt && !loop_done);
1139 1317
1140 if (loop_done != 2) 1318 if (loop_done != 2)
1141 loop_done = 0; 1319 loop_done = 0;
1142} 1320}
1143 1321
1203void 1381void
1204ev_io_start (EV_P_ struct ev_io *w) 1382ev_io_start (EV_P_ struct ev_io *w)
1205{ 1383{
1206 int fd = w->fd; 1384 int fd = w->fd;
1207 1385
1208 if (ev_is_active (w)) 1386 if (expect_false (ev_is_active (w)))
1209 return; 1387 return;
1210 1388
1211 assert (("ev_io_start called with negative fd", fd >= 0)); 1389 assert (("ev_io_start called with negative fd", fd >= 0));
1212 1390
1213 ev_start (EV_A_ (W)w, 1); 1391 ev_start (EV_A_ (W)w, 1);
1219 1397
1220void 1398void
1221ev_io_stop (EV_P_ struct ev_io *w) 1399ev_io_stop (EV_P_ struct ev_io *w)
1222{ 1400{
1223 ev_clear_pending (EV_A_ (W)w); 1401 ev_clear_pending (EV_A_ (W)w);
1224 if (!ev_is_active (w)) 1402 if (expect_false (!ev_is_active (w)))
1225 return; 1403 return;
1404
1405 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1226 1406
1227 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1407 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1228 ev_stop (EV_A_ (W)w); 1408 ev_stop (EV_A_ (W)w);
1229 1409
1230 fd_change (EV_A_ w->fd); 1410 fd_change (EV_A_ w->fd);
1231} 1411}
1232 1412
1233void 1413void
1234ev_timer_start (EV_P_ struct ev_timer *w) 1414ev_timer_start (EV_P_ struct ev_timer *w)
1235{ 1415{
1236 if (ev_is_active (w)) 1416 if (expect_false (ev_is_active (w)))
1237 return; 1417 return;
1238 1418
1239 ((WT)w)->at += mn_now; 1419 ((WT)w)->at += mn_now;
1240 1420
1241 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1421 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1242 1422
1243 ev_start (EV_A_ (W)w, ++timercnt); 1423 ev_start (EV_A_ (W)w, ++timercnt);
1244 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1424 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1245 timers [timercnt - 1] = w; 1425 timers [timercnt - 1] = w;
1246 upheap ((WT *)timers, timercnt - 1); 1426 upheap ((WT *)timers, timercnt - 1);
1247 1427
1248 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1428 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1249} 1429}
1250 1430
1251void 1431void
1252ev_timer_stop (EV_P_ struct ev_timer *w) 1432ev_timer_stop (EV_P_ struct ev_timer *w)
1253{ 1433{
1254 ev_clear_pending (EV_A_ (W)w); 1434 ev_clear_pending (EV_A_ (W)w);
1255 if (!ev_is_active (w)) 1435 if (expect_false (!ev_is_active (w)))
1256 return; 1436 return;
1257 1437
1258 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1438 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1259 1439
1260 if (((W)w)->active < timercnt--) 1440 if (expect_true (((W)w)->active < timercnt--))
1261 { 1441 {
1262 timers [((W)w)->active - 1] = timers [timercnt]; 1442 timers [((W)w)->active - 1] = timers [timercnt];
1263 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1443 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1264 } 1444 }
1265 1445
1266 ((WT)w)->at = w->repeat; 1446 ((WT)w)->at -= mn_now;
1267 1447
1268 ev_stop (EV_A_ (W)w); 1448 ev_stop (EV_A_ (W)w);
1269} 1449}
1270 1450
1271void 1451void
1274 if (ev_is_active (w)) 1454 if (ev_is_active (w))
1275 { 1455 {
1276 if (w->repeat) 1456 if (w->repeat)
1277 { 1457 {
1278 ((WT)w)->at = mn_now + w->repeat; 1458 ((WT)w)->at = mn_now + w->repeat;
1279 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1459 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1280 } 1460 }
1281 else 1461 else
1282 ev_timer_stop (EV_A_ w); 1462 ev_timer_stop (EV_A_ w);
1283 } 1463 }
1284 else if (w->repeat) 1464 else if (w->repeat)
1465 {
1466 w->at = w->repeat;
1285 ev_timer_start (EV_A_ w); 1467 ev_timer_start (EV_A_ w);
1468 }
1286} 1469}
1287 1470
1471#if EV_PERIODICS
1288void 1472void
1289ev_periodic_start (EV_P_ struct ev_periodic *w) 1473ev_periodic_start (EV_P_ struct ev_periodic *w)
1290{ 1474{
1291 if (ev_is_active (w)) 1475 if (expect_false (ev_is_active (w)))
1292 return; 1476 return;
1293 1477
1478 if (w->reschedule_cb)
1479 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1480 else if (w->interval)
1481 {
1294 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1482 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1295
1296 /* this formula differs from the one in periodic_reify because we do not always round up */ 1483 /* this formula differs from the one in periodic_reify because we do not always round up */
1297 if (w->interval)
1298 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1484 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1485 }
1299 1486
1300 ev_start (EV_A_ (W)w, ++periodiccnt); 1487 ev_start (EV_A_ (W)w, ++periodiccnt);
1301 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1488 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1302 periodics [periodiccnt - 1] = w; 1489 periodics [periodiccnt - 1] = w;
1303 upheap ((WT *)periodics, periodiccnt - 1); 1490 upheap ((WT *)periodics, periodiccnt - 1);
1304 1491
1305 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1492 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1306} 1493}
1307 1494
1308void 1495void
1309ev_periodic_stop (EV_P_ struct ev_periodic *w) 1496ev_periodic_stop (EV_P_ struct ev_periodic *w)
1310{ 1497{
1311 ev_clear_pending (EV_A_ (W)w); 1498 ev_clear_pending (EV_A_ (W)w);
1312 if (!ev_is_active (w)) 1499 if (expect_false (!ev_is_active (w)))
1313 return; 1500 return;
1314 1501
1315 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1502 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1316 1503
1317 if (((W)w)->active < periodiccnt--) 1504 if (expect_true (((W)w)->active < periodiccnt--))
1318 { 1505 {
1319 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1506 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1320 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1507 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1321 } 1508 }
1322 1509
1323 ev_stop (EV_A_ (W)w); 1510 ev_stop (EV_A_ (W)w);
1324} 1511}
1325 1512
1326void 1513void
1514ev_periodic_again (EV_P_ struct ev_periodic *w)
1515{
1516 /* TODO: use adjustheap and recalculation */
1517 ev_periodic_stop (EV_A_ w);
1518 ev_periodic_start (EV_A_ w);
1519}
1520#endif
1521
1522void
1327ev_idle_start (EV_P_ struct ev_idle *w) 1523ev_idle_start (EV_P_ struct ev_idle *w)
1328{ 1524{
1329 if (ev_is_active (w)) 1525 if (expect_false (ev_is_active (w)))
1330 return; 1526 return;
1331 1527
1332 ev_start (EV_A_ (W)w, ++idlecnt); 1528 ev_start (EV_A_ (W)w, ++idlecnt);
1333 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1529 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1334 idles [idlecnt - 1] = w; 1530 idles [idlecnt - 1] = w;
1335} 1531}
1336 1532
1337void 1533void
1338ev_idle_stop (EV_P_ struct ev_idle *w) 1534ev_idle_stop (EV_P_ struct ev_idle *w)
1339{ 1535{
1340 ev_clear_pending (EV_A_ (W)w); 1536 ev_clear_pending (EV_A_ (W)w);
1341 if (ev_is_active (w)) 1537 if (expect_false (!ev_is_active (w)))
1342 return; 1538 return;
1343 1539
1344 idles [((W)w)->active - 1] = idles [--idlecnt]; 1540 idles [((W)w)->active - 1] = idles [--idlecnt];
1345 ev_stop (EV_A_ (W)w); 1541 ev_stop (EV_A_ (W)w);
1346} 1542}
1347 1543
1348void 1544void
1349ev_prepare_start (EV_P_ struct ev_prepare *w) 1545ev_prepare_start (EV_P_ struct ev_prepare *w)
1350{ 1546{
1351 if (ev_is_active (w)) 1547 if (expect_false (ev_is_active (w)))
1352 return; 1548 return;
1353 1549
1354 ev_start (EV_A_ (W)w, ++preparecnt); 1550 ev_start (EV_A_ (W)w, ++preparecnt);
1355 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1551 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1356 prepares [preparecnt - 1] = w; 1552 prepares [preparecnt - 1] = w;
1357} 1553}
1358 1554
1359void 1555void
1360ev_prepare_stop (EV_P_ struct ev_prepare *w) 1556ev_prepare_stop (EV_P_ struct ev_prepare *w)
1361{ 1557{
1362 ev_clear_pending (EV_A_ (W)w); 1558 ev_clear_pending (EV_A_ (W)w);
1363 if (ev_is_active (w)) 1559 if (expect_false (!ev_is_active (w)))
1364 return; 1560 return;
1365 1561
1366 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1562 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1367 ev_stop (EV_A_ (W)w); 1563 ev_stop (EV_A_ (W)w);
1368} 1564}
1369 1565
1370void 1566void
1371ev_check_start (EV_P_ struct ev_check *w) 1567ev_check_start (EV_P_ struct ev_check *w)
1372{ 1568{
1373 if (ev_is_active (w)) 1569 if (expect_false (ev_is_active (w)))
1374 return; 1570 return;
1375 1571
1376 ev_start (EV_A_ (W)w, ++checkcnt); 1572 ev_start (EV_A_ (W)w, ++checkcnt);
1377 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1573 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1378 checks [checkcnt - 1] = w; 1574 checks [checkcnt - 1] = w;
1379} 1575}
1380 1576
1381void 1577void
1382ev_check_stop (EV_P_ struct ev_check *w) 1578ev_check_stop (EV_P_ struct ev_check *w)
1383{ 1579{
1384 ev_clear_pending (EV_A_ (W)w); 1580 ev_clear_pending (EV_A_ (W)w);
1385 if (ev_is_active (w)) 1581 if (expect_false (!ev_is_active (w)))
1386 return; 1582 return;
1387 1583
1388 checks [((W)w)->active - 1] = checks [--checkcnt]; 1584 checks [((W)w)->active - 1] = checks [--checkcnt];
1389 ev_stop (EV_A_ (W)w); 1585 ev_stop (EV_A_ (W)w);
1390} 1586}
1395 1591
1396void 1592void
1397ev_signal_start (EV_P_ struct ev_signal *w) 1593ev_signal_start (EV_P_ struct ev_signal *w)
1398{ 1594{
1399#if EV_MULTIPLICITY 1595#if EV_MULTIPLICITY
1400 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1596 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1401#endif 1597#endif
1402 if (ev_is_active (w)) 1598 if (expect_false (ev_is_active (w)))
1403 return; 1599 return;
1404 1600
1405 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1601 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1406 1602
1407 ev_start (EV_A_ (W)w, 1); 1603 ev_start (EV_A_ (W)w, 1);
1408 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1604 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1409 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1605 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1410 1606
1411 if (!((WL)w)->next) 1607 if (!((WL)w)->next)
1412 { 1608 {
1413#if WIN32 1609#if _WIN32
1414 signal (w->signum, sighandler); 1610 signal (w->signum, sighandler);
1415#else 1611#else
1416 struct sigaction sa; 1612 struct sigaction sa;
1417 sa.sa_handler = sighandler; 1613 sa.sa_handler = sighandler;
1418 sigfillset (&sa.sa_mask); 1614 sigfillset (&sa.sa_mask);
1424 1620
1425void 1621void
1426ev_signal_stop (EV_P_ struct ev_signal *w) 1622ev_signal_stop (EV_P_ struct ev_signal *w)
1427{ 1623{
1428 ev_clear_pending (EV_A_ (W)w); 1624 ev_clear_pending (EV_A_ (W)w);
1429 if (!ev_is_active (w)) 1625 if (expect_false (!ev_is_active (w)))
1430 return; 1626 return;
1431 1627
1432 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1628 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1433 ev_stop (EV_A_ (W)w); 1629 ev_stop (EV_A_ (W)w);
1434 1630
1438 1634
1439void 1635void
1440ev_child_start (EV_P_ struct ev_child *w) 1636ev_child_start (EV_P_ struct ev_child *w)
1441{ 1637{
1442#if EV_MULTIPLICITY 1638#if EV_MULTIPLICITY
1443 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1639 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1444#endif 1640#endif
1445 if (ev_is_active (w)) 1641 if (expect_false (ev_is_active (w)))
1446 return; 1642 return;
1447 1643
1448 ev_start (EV_A_ (W)w, 1); 1644 ev_start (EV_A_ (W)w, 1);
1449 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1645 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1450} 1646}
1451 1647
1452void 1648void
1453ev_child_stop (EV_P_ struct ev_child *w) 1649ev_child_stop (EV_P_ struct ev_child *w)
1454{ 1650{
1455 ev_clear_pending (EV_A_ (W)w); 1651 ev_clear_pending (EV_A_ (W)w);
1456 if (ev_is_active (w)) 1652 if (expect_false (!ev_is_active (w)))
1457 return; 1653 return;
1458 1654
1459 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1655 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1460 ev_stop (EV_A_ (W)w); 1656 ev_stop (EV_A_ (W)w);
1461} 1657}
1498void 1694void
1499ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1695ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1500{ 1696{
1501 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1697 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1502 1698
1503 if (!once) 1699 if (expect_false (!once))
1700 {
1504 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1701 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1505 else 1702 return;
1506 { 1703 }
1704
1507 once->cb = cb; 1705 once->cb = cb;
1508 once->arg = arg; 1706 once->arg = arg;
1509 1707
1510 ev_watcher_init (&once->io, once_cb_io); 1708 ev_init (&once->io, once_cb_io);
1511 if (fd >= 0) 1709 if (fd >= 0)
1512 { 1710 {
1513 ev_io_set (&once->io, fd, events); 1711 ev_io_set (&once->io, fd, events);
1514 ev_io_start (EV_A_ &once->io); 1712 ev_io_start (EV_A_ &once->io);
1515 } 1713 }
1516 1714
1517 ev_watcher_init (&once->to, once_cb_to); 1715 ev_init (&once->to, once_cb_to);
1518 if (timeout >= 0.) 1716 if (timeout >= 0.)
1519 { 1717 {
1520 ev_timer_set (&once->to, timeout, 0.); 1718 ev_timer_set (&once->to, timeout, 0.);
1521 ev_timer_start (EV_A_ &once->to); 1719 ev_timer_start (EV_A_ &once->to);
1522 }
1523 } 1720 }
1524} 1721}
1525 1722
1723#ifdef __cplusplus
1724}
1725#endif
1726

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines