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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines