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

Comparing libev/ev.c (file contents):
Revision 1.72 by root, Tue Nov 6 16:09:37 2007 UTC vs.
Revision 1.128 by root, Thu Nov 22 12:28:27 2007 UTC

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

Diff Legend

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