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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines