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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines