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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines