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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines