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

Diff Legend

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