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

Comparing libev/ev.c (file contents):
Revision 1.71 by root, Tue Nov 6 13:17:55 2007 UTC vs.
Revision 1.125 by root, Sat Nov 17 02:28:43 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines