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

Comparing libev/ev.c (file contents):
Revision 1.64 by root, Sun Nov 4 23:14:11 2007 UTC vs.
Revision 1.85 by root, Sat Nov 10 03:13:50 2007 UTC

… …
54 54
55#endif 55#endif
56 56
57#include <math.h> 57#include <math.h>
58#include <stdlib.h> 58#include <stdlib.h>
59#include <unistd.h>
60#include <fcntl.h> 59#include <fcntl.h>
61#include <signal.h>
62#include <stddef.h> 60#include <stddef.h>
63 61
64#include <stdio.h> 62#include <stdio.h>
65 63
66#include <assert.h> 64#include <assert.h>
67#include <errno.h> 65#include <errno.h>
68#include <sys/types.h> 66#include <sys/types.h>
67#include <time.h>
68
69#include <signal.h>
70
69#ifndef WIN32 71#ifndef WIN32
72# include <unistd.h>
73# include <sys/time.h>
70# include <sys/wait.h> 74# include <sys/wait.h>
71#endif 75#endif
72#include <sys/time.h>
73#include <time.h>
74
75/**/ 76/**/
76 77
77#ifndef EV_USE_MONOTONIC 78#ifndef EV_USE_MONOTONIC
78# define EV_USE_MONOTONIC 1 79# define EV_USE_MONOTONIC 1
79#endif 80#endif
… …
94# define EV_USE_KQUEUE 0 95# define EV_USE_KQUEUE 0
95#endif 96#endif
96 97
97#ifndef EV_USE_WIN32 98#ifndef EV_USE_WIN32
98# ifdef WIN32 99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
99# define EV_USE_WIN32 1 102# define EV_USE_SELECT 1
100# else 103# else
101# define EV_USE_WIN32 0 104# define EV_USE_WIN32 0
102# endif 105# endif
103#endif 106#endif
104 107
… …
123#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
124#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 127#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
125#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 128#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
126/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 129/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
127 130
131#ifdef EV_H
132# include EV_H
133#else
128#include "ev.h" 134# include "ev.h"
135#endif
129 136
130#if __GNUC__ >= 3 137#if __GNUC__ >= 3
131# define expect(expr,value) __builtin_expect ((expr),(value)) 138# define expect(expr,value) __builtin_expect ((expr),(value))
132# define inline inline 139# define inline inline
133#else 140#else
… …
145typedef struct ev_watcher_list *WL; 152typedef struct ev_watcher_list *WL;
146typedef struct ev_watcher_time *WT; 153typedef struct ev_watcher_time *WT;
147 154
148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 155static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
149 156
157#include "ev_win32.c"
158
150/*****************************************************************************/ 159/*****************************************************************************/
151 160
161static void (*syserr_cb)(const char *msg);
162
163void ev_set_syserr_cb (void (*cb)(const char *msg))
164{
165 syserr_cb = cb;
166}
167
168static void
169syserr (const char *msg)
170{
171 if (!msg)
172 msg = "(libev) system error";
173
174 if (syserr_cb)
175 syserr_cb (msg);
176 else
177 {
178 perror (msg);
179 abort ();
180 }
181}
182
183static void *(*alloc)(void *ptr, long size);
184
185void ev_set_allocator (void *(*cb)(void *ptr, long size))
186{
187 alloc = cb;
188}
189
190static void *
191ev_realloc (void *ptr, long size)
192{
193 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
194
195 if (!ptr && size)
196 {
197 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
198 abort ();
199 }
200
201 return ptr;
202}
203
204#define ev_malloc(size) ev_realloc (0, (size))
205#define ev_free(ptr) ev_realloc ((ptr), 0)
206
207/*****************************************************************************/
208
152typedef struct 209typedef struct
153{ 210{
154 struct ev_watcher_list *head; 211 WL head;
155 unsigned char events; 212 unsigned char events;
156 unsigned char reify; 213 unsigned char reify;
157} ANFD; 214} ANFD;
158 215
159typedef struct 216typedef struct
… …
162 int events; 219 int events;
163} ANPENDING; 220} ANPENDING;
164 221
165#if EV_MULTIPLICITY 222#if EV_MULTIPLICITY
166 223
167struct ev_loop 224 struct ev_loop
168{ 225 {
169# define VAR(name,decl) decl; 226 #define VAR(name,decl) decl;
170# include "ev_vars.h" 227 #include "ev_vars.h"
171};
172# undef VAR 228 #undef VAR
229 };
173# include "ev_wrap.h" 230 #include "ev_wrap.h"
231
232 struct ev_loop default_loop_struct;
233 static struct ev_loop *default_loop;
174 234
175#else 235#else
176 236
177# define VAR(name,decl) static decl; 237 #define VAR(name,decl) static decl;
178# include "ev_vars.h" 238 #include "ev_vars.h"
179# undef VAR 239 #undef VAR
240
241 static int default_loop;
180 242
181#endif 243#endif
182 244
183/*****************************************************************************/ 245/*****************************************************************************/
184 246
… …
209#endif 271#endif
210 272
211 return ev_time (); 273 return ev_time ();
212} 274}
213 275
276#if EV_MULTIPLICITY
214ev_tstamp 277ev_tstamp
215ev_now (EV_P) 278ev_now (EV_P)
216{ 279{
217 return rt_now; 280 return ev_rt_now;
218} 281}
282#endif
219 283
220#define array_roundsize(base,n) ((n) | 4 & ~3) 284#define array_roundsize(type,n) ((n) | 4 & ~3)
221 285
222#define array_needsize(base,cur,cnt,init) \ 286#define array_needsize(type,base,cur,cnt,init) \
223 if (expect_false ((cnt) > cur)) \ 287 if (expect_false ((cnt) > cur)) \
224 { \ 288 { \
225 int newcnt = cur; \ 289 int newcnt = cur; \
226 do \ 290 do \
227 { \ 291 { \
228 newcnt = array_roundsize (base, newcnt << 1); \ 292 newcnt = array_roundsize (type, newcnt << 1); \
229 } \ 293 } \
230 while ((cnt) > newcnt); \ 294 while ((cnt) > newcnt); \
231 \ 295 \
232 base = realloc (base, sizeof (*base) * (newcnt)); \ 296 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
233 init (base + cur, newcnt - cur); \ 297 init (base + cur, newcnt - cur); \
234 cur = newcnt; \ 298 cur = newcnt; \
235 } 299 }
300
301#define array_slim(type,stem) \
302 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
303 { \
304 stem ## max = array_roundsize (stem ## cnt >> 1); \
305 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
306 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
307 }
308
309/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
310/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
311#define array_free_microshit(stem) \
312 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
313
314#define array_free(stem, idx) \
315 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
236 316
237/*****************************************************************************/ 317/*****************************************************************************/
238 318
239static void 319static void
240anfds_init (ANFD *base, int count) 320anfds_init (ANFD *base, int count)
… …
247 327
248 ++base; 328 ++base;
249 } 329 }
250} 330}
251 331
252static void 332void
253event (EV_P_ W w, int events) 333ev_feed_event (EV_P_ void *w, int revents)
254{ 334{
335 W w_ = (W)w;
336
255 if (w->pending) 337 if (w_->pending)
256 { 338 {
257 pendings [ABSPRI (w)][w->pending - 1].events |= events; 339 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
258 return; 340 return;
259 } 341 }
260 342
261 w->pending = ++pendingcnt [ABSPRI (w)]; 343 w_->pending = ++pendingcnt [ABSPRI (w_)];
262 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 344 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
263 pendings [ABSPRI (w)][w->pending - 1].w = w; 345 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
264 pendings [ABSPRI (w)][w->pending - 1].events = events; 346 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
265} 347}
266 348
267static void 349static void
268queue_events (EV_P_ W *events, int eventcnt, int type) 350queue_events (EV_P_ W *events, int eventcnt, int type)
269{ 351{
270 int i; 352 int i;
271 353
272 for (i = 0; i < eventcnt; ++i) 354 for (i = 0; i < eventcnt; ++i)
273 event (EV_A_ events [i], type); 355 ev_feed_event (EV_A_ events [i], type);
274} 356}
275 357
276static void 358inline void
277fd_event (EV_P_ int fd, int events) 359fd_event (EV_P_ int fd, int revents)
278{ 360{
279 ANFD *anfd = anfds + fd; 361 ANFD *anfd = anfds + fd;
280 struct ev_io *w; 362 struct ev_io *w;
281 363
282 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 364 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
283 { 365 {
284 int ev = w->events & events; 366 int ev = w->events & revents;
285 367
286 if (ev) 368 if (ev)
287 event (EV_A_ (W)w, ev); 369 ev_feed_event (EV_A_ (W)w, ev);
288 } 370 }
371}
372
373void
374ev_feed_fd_event (EV_P_ int fd, int revents)
375{
376 fd_event (EV_A_ fd, revents);
289} 377}
290 378
291/*****************************************************************************/ 379/*****************************************************************************/
292 380
293static void 381static void
… …
316} 404}
317 405
318static void 406static void
319fd_change (EV_P_ int fd) 407fd_change (EV_P_ int fd)
320{ 408{
321 if (anfds [fd].reify || fdchangecnt < 0) 409 if (anfds [fd].reify)
322 return; 410 return;
323 411
324 anfds [fd].reify = 1; 412 anfds [fd].reify = 1;
325 413
326 ++fdchangecnt; 414 ++fdchangecnt;
327 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 415 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
328 fdchanges [fdchangecnt - 1] = fd; 416 fdchanges [fdchangecnt - 1] = fd;
329} 417}
330 418
331static void 419static void
332fd_kill (EV_P_ int fd) 420fd_kill (EV_P_ int fd)
… …
334 struct ev_io *w; 422 struct ev_io *w;
335 423
336 while ((w = (struct ev_io *)anfds [fd].head)) 424 while ((w = (struct ev_io *)anfds [fd].head))
337 { 425 {
338 ev_io_stop (EV_A_ w); 426 ev_io_stop (EV_A_ w);
339 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 427 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
340 } 428 }
429}
430
431static int
432fd_valid (int fd)
433{
434#ifdef WIN32
435 return !!win32_get_osfhandle (fd);
436#else
437 return fcntl (fd, F_GETFD) != -1;
438#endif
341} 439}
342 440
343/* called on EBADF to verify fds */ 441/* called on EBADF to verify fds */
344static void 442static void
345fd_ebadf (EV_P) 443fd_ebadf (EV_P)
346{ 444{
347 int fd; 445 int fd;
348 446
349 for (fd = 0; fd < anfdmax; ++fd) 447 for (fd = 0; fd < anfdmax; ++fd)
350 if (anfds [fd].events) 448 if (anfds [fd].events)
351 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 449 if (!fd_valid (fd) == -1 && errno == EBADF)
352 fd_kill (EV_A_ fd); 450 fd_kill (EV_A_ fd);
353} 451}
354 452
355/* called on ENOMEM in select/poll to kill some fds and retry */ 453/* called on ENOMEM in select/poll to kill some fds and retry */
356static void 454static void
… …
359 int fd; 457 int fd;
360 458
361 for (fd = anfdmax; fd--; ) 459 for (fd = anfdmax; fd--; )
362 if (anfds [fd].events) 460 if (anfds [fd].events)
363 { 461 {
364 close (fd);
365 fd_kill (EV_A_ fd); 462 fd_kill (EV_A_ fd);
366 return; 463 return;
367 } 464 }
368} 465}
369 466
370/* susually called after fork if method needs to re-arm all fds from scratch */ 467/* usually called after fork if method needs to re-arm all fds from scratch */
371static void 468static void
372fd_rearm_all (EV_P) 469fd_rearm_all (EV_P)
373{ 470{
374 int fd; 471 int fd;
375 472
… …
423 520
424 heap [k] = w; 521 heap [k] = w;
425 ((W)heap [k])->active = k + 1; 522 ((W)heap [k])->active = k + 1;
426} 523}
427 524
525inline void
526adjustheap (WT *heap, int N, int k, ev_tstamp at)
527{
528 ev_tstamp old_at = heap [k]->at;
529 heap [k]->at = at;
530
531 if (old_at < at)
532 downheap (heap, N, k);
533 else
534 upheap (heap, k);
535}
536
428/*****************************************************************************/ 537/*****************************************************************************/
429 538
430typedef struct 539typedef struct
431{ 540{
432 struct ev_watcher_list *head; 541 WL head;
433 sig_atomic_t volatile gotsig; 542 sig_atomic_t volatile gotsig;
434} ANSIG; 543} ANSIG;
435 544
436static ANSIG *signals; 545static ANSIG *signals;
437static int signalmax; 546static int signalmax;
… …
453} 562}
454 563
455static void 564static void
456sighandler (int signum) 565sighandler (int signum)
457{ 566{
567#if WIN32
568 signal (signum, sighandler);
569#endif
570
458 signals [signum - 1].gotsig = 1; 571 signals [signum - 1].gotsig = 1;
459 572
460 if (!gotsig) 573 if (!gotsig)
461 { 574 {
462 int old_errno = errno; 575 int old_errno = errno;
463 gotsig = 1; 576 gotsig = 1;
577#ifdef WIN32
578 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
579#else
464 write (sigpipe [1], &signum, 1); 580 write (sigpipe [1], &signum, 1);
581#endif
465 errno = old_errno; 582 errno = old_errno;
466 } 583 }
467} 584}
468 585
586void
587ev_feed_signal_event (EV_P_ int signum)
588{
589 WL w;
590
591#if EV_MULTIPLICITY
592 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
593#endif
594
595 --signum;
596
597 if (signum < 0 || signum >= signalmax)
598 return;
599
600 signals [signum].gotsig = 0;
601
602 for (w = signals [signum].head; w; w = w->next)
603 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
604}
605
469static void 606static void
470sigcb (EV_P_ struct ev_io *iow, int revents) 607sigcb (EV_P_ struct ev_io *iow, int revents)
471{ 608{
472 struct ev_watcher_list *w;
473 int signum; 609 int signum;
474 610
611#ifdef WIN32
612 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
613#else
475 read (sigpipe [0], &revents, 1); 614 read (sigpipe [0], &revents, 1);
615#endif
476 gotsig = 0; 616 gotsig = 0;
477 617
478 for (signum = signalmax; signum--; ) 618 for (signum = signalmax; signum--; )
479 if (signals [signum].gotsig) 619 if (signals [signum].gotsig)
480 { 620 ev_feed_signal_event (EV_A_ signum + 1);
481 signals [signum].gotsig = 0;
482
483 for (w = signals [signum].head; w; w = w->next)
484 event (EV_A_ (W)w, EV_SIGNAL);
485 }
486} 621}
487 622
488static void 623static void
489siginit (EV_P) 624siginit (EV_P)
490{ 625{
… …
502 ev_unref (EV_A); /* child watcher should not keep loop alive */ 637 ev_unref (EV_A); /* child watcher should not keep loop alive */
503} 638}
504 639
505/*****************************************************************************/ 640/*****************************************************************************/
506 641
642static struct ev_child *childs [PID_HASHSIZE];
643
507#ifndef WIN32 644#ifndef WIN32
508 645
509static struct ev_child *childs [PID_HASHSIZE];
510static struct ev_signal childev; 646static struct ev_signal childev;
511 647
512#ifndef WCONTINUED 648#ifndef WCONTINUED
513# define WCONTINUED 0 649# define WCONTINUED 0
514#endif 650#endif
… …
522 if (w->pid == pid || !w->pid) 658 if (w->pid == pid || !w->pid)
523 { 659 {
524 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 660 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
525 w->rpid = pid; 661 w->rpid = pid;
526 w->rstatus = status; 662 w->rstatus = status;
527 event (EV_A_ (W)w, EV_CHILD); 663 ev_feed_event (EV_A_ (W)w, EV_CHILD);
528 } 664 }
529} 665}
530 666
531static void 667static void
532childcb (EV_P_ struct ev_signal *sw, int revents) 668childcb (EV_P_ struct ev_signal *sw, int revents)
… …
534 int pid, status; 670 int pid, status;
535 671
536 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 672 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
537 { 673 {
538 /* make sure we are called again until all childs have been reaped */ 674 /* make sure we are called again until all childs have been reaped */
539 event (EV_A_ (W)sw, EV_SIGNAL); 675 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
540 676
541 child_reap (EV_A_ sw, pid, pid, status); 677 child_reap (EV_A_ sw, pid, pid, status);
542 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 678 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
543 } 679 }
544} 680}
… …
601 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 737 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
602 have_monotonic = 1; 738 have_monotonic = 1;
603 } 739 }
604#endif 740#endif
605 741
606 rt_now = ev_time (); 742 ev_rt_now = ev_time ();
607 mn_now = get_clock (); 743 mn_now = get_clock ();
608 now_floor = mn_now; 744 now_floor = mn_now;
609 rtmn_diff = rt_now - mn_now; 745 rtmn_diff = ev_rt_now - mn_now;
610 746
611 if (methods == EVMETHOD_AUTO) 747 if (methods == EVMETHOD_AUTO)
612 if (!enable_secure () && getenv ("LIBEV_METHODS")) 748 if (!enable_secure () && getenv ("LIBEV_METHODS"))
613 methods = atoi (getenv ("LIBEV_METHODS")); 749 methods = atoi (getenv ("LIBEV_METHODS"));
614 else 750 else
… …
628 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 764 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
629#endif 765#endif
630#if EV_USE_SELECT 766#if EV_USE_SELECT
631 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 767 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
632#endif 768#endif
769
770 ev_init (&sigev, sigcb);
771 ev_set_priority (&sigev, EV_MAXPRI);
633 } 772 }
634} 773}
635 774
636void 775void
637loop_destroy (EV_P) 776loop_destroy (EV_P)
638{ 777{
778 int i;
779
639#if EV_USE_WIN32 780#if EV_USE_WIN32
640 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 781 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
641#endif 782#endif
642#if EV_USE_KQUEUE 783#if EV_USE_KQUEUE
643 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 784 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
… …
650#endif 791#endif
651#if EV_USE_SELECT 792#if EV_USE_SELECT
652 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 793 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
653#endif 794#endif
654 795
796 for (i = NUMPRI; i--; )
797 array_free (pending, [i]);
798
799 /* have to use the microsoft-never-gets-it-right macro */
800 array_free_microshit (fdchange);
801 array_free_microshit (timer);
802 array_free_microshit (periodic);
803 array_free_microshit (idle);
804 array_free_microshit (prepare);
805 array_free_microshit (check);
806
655 method = 0; 807 method = 0;
656 /*TODO*/
657} 808}
658 809
659void 810static void
660loop_fork (EV_P) 811loop_fork (EV_P)
661{ 812{
662 /*TODO*/
663#if EV_USE_EPOLL 813#if EV_USE_EPOLL
664 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 814 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
665#endif 815#endif
666#if EV_USE_KQUEUE 816#if EV_USE_KQUEUE
667 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 817 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
668#endif 818#endif
819
820 if (ev_is_active (&sigev))
821 {
822 /* default loop */
823
824 ev_ref (EV_A);
825 ev_io_stop (EV_A_ &sigev);
826 close (sigpipe [0]);
827 close (sigpipe [1]);
828
829 while (pipe (sigpipe))
830 syserr ("(libev) error creating pipe");
831
832 siginit (EV_A);
833 }
834
835 postfork = 0;
669} 836}
670 837
671#if EV_MULTIPLICITY 838#if EV_MULTIPLICITY
672struct ev_loop * 839struct ev_loop *
673ev_loop_new (int methods) 840ev_loop_new (int methods)
674{ 841{
675 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 842 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
843
844 memset (loop, 0, sizeof (struct ev_loop));
676 845
677 loop_init (EV_A_ methods); 846 loop_init (EV_A_ methods);
678 847
679 if (ev_method (EV_A)) 848 if (ev_method (EV_A))
680 return loop; 849 return loop;
… …
684 853
685void 854void
686ev_loop_destroy (EV_P) 855ev_loop_destroy (EV_P)
687{ 856{
688 loop_destroy (EV_A); 857 loop_destroy (EV_A);
689 free (loop); 858 ev_free (loop);
690} 859}
691 860
692void 861void
693ev_loop_fork (EV_P) 862ev_loop_fork (EV_P)
694{ 863{
695 loop_fork (EV_A); 864 postfork = 1;
696} 865}
697 866
698#endif 867#endif
699 868
700#if EV_MULTIPLICITY 869#if EV_MULTIPLICITY
701struct ev_loop default_loop_struct;
702static struct ev_loop *default_loop;
703
704struct ev_loop * 870struct ev_loop *
705#else 871#else
706static int default_loop;
707
708int 872int
709#endif 873#endif
710ev_default_loop (int methods) 874ev_default_loop (int methods)
711{ 875{
712 if (sigpipe [0] == sigpipe [1]) 876 if (sigpipe [0] == sigpipe [1])
… …
723 887
724 loop_init (EV_A_ methods); 888 loop_init (EV_A_ methods);
725 889
726 if (ev_method (EV_A)) 890 if (ev_method (EV_A))
727 { 891 {
728 ev_watcher_init (&sigev, sigcb);
729 ev_set_priority (&sigev, EV_MAXPRI);
730 siginit (EV_A); 892 siginit (EV_A);
731 893
732#ifndef WIN32 894#ifndef WIN32
733 ev_signal_init (&childev, childcb, SIGCHLD); 895 ev_signal_init (&childev, childcb, SIGCHLD);
734 ev_set_priority (&childev, EV_MAXPRI); 896 ev_set_priority (&childev, EV_MAXPRI);
… …
748{ 910{
749#if EV_MULTIPLICITY 911#if EV_MULTIPLICITY
750 struct ev_loop *loop = default_loop; 912 struct ev_loop *loop = default_loop;
751#endif 913#endif
752 914
915#ifndef WIN32
753 ev_ref (EV_A); /* child watcher */ 916 ev_ref (EV_A); /* child watcher */
754 ev_signal_stop (EV_A_ &childev); 917 ev_signal_stop (EV_A_ &childev);
918#endif
755 919
756 ev_ref (EV_A); /* signal watcher */ 920 ev_ref (EV_A); /* signal watcher */
757 ev_io_stop (EV_A_ &sigev); 921 ev_io_stop (EV_A_ &sigev);
758 922
759 close (sigpipe [0]); sigpipe [0] = 0; 923 close (sigpipe [0]); sigpipe [0] = 0;
… …
767{ 931{
768#if EV_MULTIPLICITY 932#if EV_MULTIPLICITY
769 struct ev_loop *loop = default_loop; 933 struct ev_loop *loop = default_loop;
770#endif 934#endif
771 935
772 loop_fork (EV_A); 936 if (method)
773 937 postfork = 1;
774 ev_io_stop (EV_A_ &sigev);
775 close (sigpipe [0]);
776 close (sigpipe [1]);
777 pipe (sigpipe);
778
779 ev_ref (EV_A); /* signal watcher */
780 siginit (EV_A);
781} 938}
782 939
783/*****************************************************************************/ 940/*****************************************************************************/
941
942static int
943any_pending (EV_P)
944{
945 int pri;
946
947 for (pri = NUMPRI; pri--; )
948 if (pendingcnt [pri])
949 return 1;
950
951 return 0;
952}
784 953
785static void 954static void
786call_pending (EV_P) 955call_pending (EV_P)
787{ 956{
788 int pri; 957 int pri;
… …
793 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 962 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
794 963
795 if (p->w) 964 if (p->w)
796 { 965 {
797 p->w->pending = 0; 966 p->w->pending = 0;
798 967 EV_CB_INVOKE (p->w, p->events);
799 (*(void (**)(EV_P_ W, int))&p->w->cb) (EV_A_ p->w, p->events);
800 } 968 }
801 } 969 }
802} 970}
803 971
804static void 972static void
… …
818 downheap ((WT *)timers, timercnt, 0); 986 downheap ((WT *)timers, timercnt, 0);
819 } 987 }
820 else 988 else
821 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 989 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
822 990
823 event (EV_A_ (W)w, EV_TIMEOUT); 991 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
824 } 992 }
825} 993}
826 994
827static void 995static void
828periodics_reify (EV_P) 996periodics_reify (EV_P)
829{ 997{
830 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 998 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
831 { 999 {
832 struct ev_periodic *w = periodics [0]; 1000 struct ev_periodic *w = periodics [0];
833 1001
834 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1002 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
835 1003
836 /* first reschedule or stop timer */ 1004 /* first reschedule or stop timer */
837 if (w->interval) 1005 if (w->reschedule_cb)
838 { 1006 {
1007 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1008
1009 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1010 downheap ((WT *)periodics, periodiccnt, 0);
1011 }
1012 else if (w->interval)
1013 {
839 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1014 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
840 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1015 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
841 downheap ((WT *)periodics, periodiccnt, 0); 1016 downheap ((WT *)periodics, periodiccnt, 0);
842 } 1017 }
843 else 1018 else
844 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1019 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
845 1020
846 event (EV_A_ (W)w, EV_PERIODIC); 1021 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
847 } 1022 }
848} 1023}
849 1024
850static void 1025static void
851periodics_reschedule (EV_P) 1026periodics_reschedule (EV_P)
… …
855 /* adjust periodics after time jump */ 1030 /* adjust periodics after time jump */
856 for (i = 0; i < periodiccnt; ++i) 1031 for (i = 0; i < periodiccnt; ++i)
857 { 1032 {
858 struct ev_periodic *w = periodics [i]; 1033 struct ev_periodic *w = periodics [i];
859 1034
1035 if (w->reschedule_cb)
1036 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
860 if (w->interval) 1037 else if (w->interval)
861 {
862 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1038 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
863
864 if (fabs (diff) >= 1e-4)
865 {
866 ev_periodic_stop (EV_A_ w);
867 ev_periodic_start (EV_A_ w);
868
869 i = 0; /* restart loop, inefficient, but time jumps should be rare */
870 }
871 }
872 } 1039 }
1040
1041 /* now rebuild the heap */
1042 for (i = periodiccnt >> 1; i--; )
1043 downheap ((WT *)periodics, periodiccnt, i);
873} 1044}
874 1045
875inline int 1046inline int
876time_update_monotonic (EV_P) 1047time_update_monotonic (EV_P)
877{ 1048{
878 mn_now = get_clock (); 1049 mn_now = get_clock ();
879 1050
880 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1051 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
881 { 1052 {
882 rt_now = rtmn_diff + mn_now; 1053 ev_rt_now = rtmn_diff + mn_now;
883 return 0; 1054 return 0;
884 } 1055 }
885 else 1056 else
886 { 1057 {
887 now_floor = mn_now; 1058 now_floor = mn_now;
888 rt_now = ev_time (); 1059 ev_rt_now = ev_time ();
889 return 1; 1060 return 1;
890 } 1061 }
891} 1062}
892 1063
893static void 1064static void
… …
902 { 1073 {
903 ev_tstamp odiff = rtmn_diff; 1074 ev_tstamp odiff = rtmn_diff;
904 1075
905 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1076 for (i = 4; --i; ) /* loop a few times, before making important decisions */
906 { 1077 {
907 rtmn_diff = rt_now - mn_now; 1078 rtmn_diff = ev_rt_now - mn_now;
908 1079
909 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1080 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
910 return; /* all is well */ 1081 return; /* all is well */
911 1082
912 rt_now = ev_time (); 1083 ev_rt_now = ev_time ();
913 mn_now = get_clock (); 1084 mn_now = get_clock ();
914 now_floor = mn_now; 1085 now_floor = mn_now;
915 } 1086 }
916 1087
917 periodics_reschedule (EV_A); 1088 periodics_reschedule (EV_A);
… …
920 } 1091 }
921 } 1092 }
922 else 1093 else
923#endif 1094#endif
924 { 1095 {
925 rt_now = ev_time (); 1096 ev_rt_now = ev_time ();
926 1097
927 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1098 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
928 { 1099 {
929 periodics_reschedule (EV_A); 1100 periodics_reschedule (EV_A);
930 1101
931 /* adjust timers. this is easy, as the offset is the same for all */ 1102 /* adjust timers. this is easy, as the offset is the same for all */
932 for (i = 0; i < timercnt; ++i) 1103 for (i = 0; i < timercnt; ++i)
933 ((WT)timers [i])->at += rt_now - mn_now; 1104 ((WT)timers [i])->at += ev_rt_now - mn_now;
934 } 1105 }
935 1106
936 mn_now = rt_now; 1107 mn_now = ev_rt_now;
937 } 1108 }
938} 1109}
939 1110
940void 1111void
941ev_ref (EV_P) 1112ev_ref (EV_P)
… …
964 { 1135 {
965 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1136 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
966 call_pending (EV_A); 1137 call_pending (EV_A);
967 } 1138 }
968 1139
1140 /* we might have forked, so reify kernel state if necessary */
1141 if (expect_false (postfork))
1142 loop_fork (EV_A);
1143
969 /* update fd-related kernel structures */ 1144 /* update fd-related kernel structures */
970 fd_reify (EV_A); 1145 fd_reify (EV_A);
971 1146
972 /* calculate blocking time */ 1147 /* calculate blocking time */
973 1148
974 /* we only need this for !monotonic clockor timers, but as we basically 1149 /* we only need this for !monotonic clock or timers, but as we basically
975 always have timers, we just calculate it always */ 1150 always have timers, we just calculate it always */
976#if EV_USE_MONOTONIC 1151#if EV_USE_MONOTONIC
977 if (expect_true (have_monotonic)) 1152 if (expect_true (have_monotonic))
978 time_update_monotonic (EV_A); 1153 time_update_monotonic (EV_A);
979 else 1154 else
980#endif 1155#endif
981 { 1156 {
982 rt_now = ev_time (); 1157 ev_rt_now = ev_time ();
983 mn_now = rt_now; 1158 mn_now = ev_rt_now;
984 } 1159 }
985 1160
986 if (flags & EVLOOP_NONBLOCK || idlecnt) 1161 if (flags & EVLOOP_NONBLOCK || idlecnt)
987 block = 0.; 1162 block = 0.;
988 else 1163 else
… …
995 if (block > to) block = to; 1170 if (block > to) block = to;
996 } 1171 }
997 1172
998 if (periodiccnt) 1173 if (periodiccnt)
999 { 1174 {
1000 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1175 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1001 if (block > to) block = to; 1176 if (block > to) block = to;
1002 } 1177 }
1003 1178
1004 if (block < 0.) block = 0.; 1179 if (block < 0.) block = 0.;
1005 } 1180 }
1006 1181
1007 method_poll (EV_A_ block); 1182 method_poll (EV_A_ block);
1008 1183
1009 /* update rt_now, do magic */ 1184 /* update ev_rt_now, do magic */
1010 time_update (EV_A); 1185 time_update (EV_A);
1011 1186
1012 /* queue pending timers and reschedule them */ 1187 /* queue pending timers and reschedule them */
1013 timers_reify (EV_A); /* relative timers called last */ 1188 timers_reify (EV_A); /* relative timers called last */
1014 periodics_reify (EV_A); /* absolute timers called first */ 1189 periodics_reify (EV_A); /* absolute timers called first */
1015 1190
1016 /* queue idle watchers unless io or timers are pending */ 1191 /* queue idle watchers unless io or timers are pending */
1017 if (!pendingcnt) 1192 if (idlecnt && !any_pending (EV_A))
1018 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1193 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1019 1194
1020 /* queue check watchers, to be executed first */ 1195 /* queue check watchers, to be executed first */
1021 if (checkcnt) 1196 if (checkcnt)
1022 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1197 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1097 return; 1272 return;
1098 1273
1099 assert (("ev_io_start called with negative fd", fd >= 0)); 1274 assert (("ev_io_start called with negative fd", fd >= 0));
1100 1275
1101 ev_start (EV_A_ (W)w, 1); 1276 ev_start (EV_A_ (W)w, 1);
1102 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1277 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1103 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1278 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1104 1279
1105 fd_change (EV_A_ fd); 1280 fd_change (EV_A_ fd);
1106} 1281}
1107 1282
… …
1127 ((WT)w)->at += mn_now; 1302 ((WT)w)->at += mn_now;
1128 1303
1129 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1304 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1130 1305
1131 ev_start (EV_A_ (W)w, ++timercnt); 1306 ev_start (EV_A_ (W)w, ++timercnt);
1132 array_needsize (timers, timermax, timercnt, ); 1307 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1133 timers [timercnt - 1] = w; 1308 timers [timercnt - 1] = w;
1134 upheap ((WT *)timers, timercnt - 1); 1309 upheap ((WT *)timers, timercnt - 1);
1135 1310
1136 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1311 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1137} 1312}
… …
1160ev_timer_again (EV_P_ struct ev_timer *w) 1335ev_timer_again (EV_P_ struct ev_timer *w)
1161{ 1336{
1162 if (ev_is_active (w)) 1337 if (ev_is_active (w))
1163 { 1338 {
1164 if (w->repeat) 1339 if (w->repeat)
1165 {
1166 ((WT)w)->at = mn_now + w->repeat;
1167 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1340 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat);
1168 }
1169 else 1341 else
1170 ev_timer_stop (EV_A_ w); 1342 ev_timer_stop (EV_A_ w);
1171 } 1343 }
1172 else if (w->repeat) 1344 else if (w->repeat)
1173 ev_timer_start (EV_A_ w); 1345 ev_timer_start (EV_A_ w);
… …
1177ev_periodic_start (EV_P_ struct ev_periodic *w) 1349ev_periodic_start (EV_P_ struct ev_periodic *w)
1178{ 1350{
1179 if (ev_is_active (w)) 1351 if (ev_is_active (w))
1180 return; 1352 return;
1181 1353
1354 if (w->reschedule_cb)
1355 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1356 else if (w->interval)
1357 {
1182 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1358 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1183
1184 /* this formula differs from the one in periodic_reify because we do not always round up */ 1359 /* this formula differs from the one in periodic_reify because we do not always round up */
1185 if (w->interval)
1186 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1360 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1361 }
1187 1362
1188 ev_start (EV_A_ (W)w, ++periodiccnt); 1363 ev_start (EV_A_ (W)w, ++periodiccnt);
1189 array_needsize (periodics, periodicmax, periodiccnt, ); 1364 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1190 periodics [periodiccnt - 1] = w; 1365 periodics [periodiccnt - 1] = w;
1191 upheap ((WT *)periodics, periodiccnt - 1); 1366 upheap ((WT *)periodics, periodiccnt - 1);
1192 1367
1193 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1368 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1194} 1369}
… …
1210 1385
1211 ev_stop (EV_A_ (W)w); 1386 ev_stop (EV_A_ (W)w);
1212} 1387}
1213 1388
1214void 1389void
1390ev_periodic_again (EV_P_ struct ev_periodic *w)
1391{
1392 /* TODO: use adjustheap and recalculation */
1393 ev_periodic_stop (EV_A_ w);
1394 ev_periodic_start (EV_A_ w);
1395}
1396
1397void
1215ev_idle_start (EV_P_ struct ev_idle *w) 1398ev_idle_start (EV_P_ struct ev_idle *w)
1216{ 1399{
1217 if (ev_is_active (w)) 1400 if (ev_is_active (w))
1218 return; 1401 return;
1219 1402
1220 ev_start (EV_A_ (W)w, ++idlecnt); 1403 ev_start (EV_A_ (W)w, ++idlecnt);
1221 array_needsize (idles, idlemax, idlecnt, ); 1404 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1222 idles [idlecnt - 1] = w; 1405 idles [idlecnt - 1] = w;
1223} 1406}
1224 1407
1225void 1408void
1226ev_idle_stop (EV_P_ struct ev_idle *w) 1409ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1238{ 1421{
1239 if (ev_is_active (w)) 1422 if (ev_is_active (w))
1240 return; 1423 return;
1241 1424
1242 ev_start (EV_A_ (W)w, ++preparecnt); 1425 ev_start (EV_A_ (W)w, ++preparecnt);
1243 array_needsize (prepares, preparemax, preparecnt, ); 1426 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1244 prepares [preparecnt - 1] = w; 1427 prepares [preparecnt - 1] = w;
1245} 1428}
1246 1429
1247void 1430void
1248ev_prepare_stop (EV_P_ struct ev_prepare *w) 1431ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1260{ 1443{
1261 if (ev_is_active (w)) 1444 if (ev_is_active (w))
1262 return; 1445 return;
1263 1446
1264 ev_start (EV_A_ (W)w, ++checkcnt); 1447 ev_start (EV_A_ (W)w, ++checkcnt);
1265 array_needsize (checks, checkmax, checkcnt, ); 1448 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1266 checks [checkcnt - 1] = w; 1449 checks [checkcnt - 1] = w;
1267} 1450}
1268 1451
1269void 1452void
1270ev_check_stop (EV_P_ struct ev_check *w) 1453ev_check_stop (EV_P_ struct ev_check *w)
… …
1291 return; 1474 return;
1292 1475
1293 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1476 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1294 1477
1295 ev_start (EV_A_ (W)w, 1); 1478 ev_start (EV_A_ (W)w, 1);
1296 array_needsize (signals, signalmax, w->signum, signals_init); 1479 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1297 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1480 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1298 1481
1299 if (!((WL)w)->next) 1482 if (!((WL)w)->next)
1300 { 1483 {
1484#if WIN32
1485 signal (w->signum, sighandler);
1486#else
1301 struct sigaction sa; 1487 struct sigaction sa;
1302 sa.sa_handler = sighandler; 1488 sa.sa_handler = sighandler;
1303 sigfillset (&sa.sa_mask); 1489 sigfillset (&sa.sa_mask);
1304 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1490 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1305 sigaction (w->signum, &sa, 0); 1491 sigaction (w->signum, &sa, 0);
1492#endif
1306 } 1493 }
1307} 1494}
1308 1495
1309void 1496void
1310ev_signal_stop (EV_P_ struct ev_signal *w) 1497ev_signal_stop (EV_P_ struct ev_signal *w)
… …
1360 void (*cb)(int revents, void *arg) = once->cb; 1547 void (*cb)(int revents, void *arg) = once->cb;
1361 void *arg = once->arg; 1548 void *arg = once->arg;
1362 1549
1363 ev_io_stop (EV_A_ &once->io); 1550 ev_io_stop (EV_A_ &once->io);
1364 ev_timer_stop (EV_A_ &once->to); 1551 ev_timer_stop (EV_A_ &once->to);
1365 free (once); 1552 ev_free (once);
1366 1553
1367 cb (revents, arg); 1554 cb (revents, arg);
1368} 1555}
1369 1556
1370static void 1557static void
… …
1380} 1567}
1381 1568
1382void 1569void
1383ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1570ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1384{ 1571{
1385 struct ev_once *once = malloc (sizeof (struct ev_once)); 1572 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1386 1573
1387 if (!once) 1574 if (!once)
1388 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1575 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1389 else 1576 else
1390 { 1577 {
1391 once->cb = cb; 1578 once->cb = cb;
1392 once->arg = arg; 1579 once->arg = arg;
1393 1580
1394 ev_watcher_init (&once->io, once_cb_io); 1581 ev_init (&once->io, once_cb_io);
1395 if (fd >= 0) 1582 if (fd >= 0)
1396 { 1583 {
1397 ev_io_set (&once->io, fd, events); 1584 ev_io_set (&once->io, fd, events);
1398 ev_io_start (EV_A_ &once->io); 1585 ev_io_start (EV_A_ &once->io);
1399 } 1586 }
1400 1587
1401 ev_watcher_init (&once->to, once_cb_to); 1588 ev_init (&once->to, once_cb_to);
1402 if (timeout >= 0.) 1589 if (timeout >= 0.)
1403 { 1590 {
1404 ev_timer_set (&once->to, timeout, 0.); 1591 ev_timer_set (&once->to, timeout, 0.);
1405 ev_timer_start (EV_A_ &once->to); 1592 ev_timer_start (EV_A_ &once->to);
1406 } 1593 }

Diff Legend

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