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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines