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

Comparing libev/ev.c (file contents):
Revision 1.74 by root, Tue Nov 6 16:51:20 2007 UTC vs.
Revision 1.123 by root, Sat Nov 17 02:23:54 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines