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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines