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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines