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

Comparing libev/ev.c (file contents):
Revision 1.50 by root, Sat Nov 3 19:41:55 2007 UTC vs.
Revision 1.52 by root, Sat Nov 3 22:10:39 2007 UTC

… …
58 58
59#ifndef EV_USE_SELECT 59#ifndef EV_USE_SELECT
60# define EV_USE_SELECT 1 60# define EV_USE_SELECT 1
61#endif 61#endif
62 62
63#ifndef EV_USE_POLL 63#ifndef EV_USEV_POLL
64# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 64# define EV_USEV_POLL 0 /* poll is usually slower than select, and not as well tested */
65#endif 65#endif
66 66
67#ifndef EV_USE_EPOLL 67#ifndef EV_USE_EPOLL
68# define EV_USE_EPOLL 0 68# define EV_USE_EPOLL 0
69#endif 69#endif
… …
113 113
114typedef struct ev_watcher *W; 114typedef struct ev_watcher *W;
115typedef struct ev_watcher_list *WL; 115typedef struct ev_watcher_list *WL;
116typedef struct ev_watcher_time *WT; 116typedef struct ev_watcher_time *WT;
117 117
118static ev_tstamp now_floor, now, diff; /* monotonic clock */ 118static ev_tstamp now_floor, mn_now, diff; /* monotonic clock */
119ev_tstamp ev_now; 119static ev_tstamp rt_now;
120int ev_method; 120static int method;
121 121
122static int have_monotonic; /* runtime */ 122static int have_monotonic; /* runtime */
123 123
124static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */ 124static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */
125static void (*method_modify)(int fd, int oev, int nev); 125static void (*method_modify)(EV_P_ int fd, int oev, int nev);
126static void (*method_poll)(ev_tstamp timeout); 126static void (*method_poll)(EV_P_ ev_tstamp timeout);
127
128static int activecnt; /* number of active events */
129
130#if EV_USE_SELECT
131static unsigned char *vec_ri, *vec_ro, *vec_wi, *vec_wo;
132static int vec_max;
133#endif
134
135#if EV_USEV_POLL
136static struct pollfd *polls;
137static int pollmax, pollcnt;
138static int *pollidxs; /* maps fds into structure indices */
139static int pollidxmax;
140#endif
141
142#if EV_USE_EPOLL
143static int epoll_fd = -1;
144
145static struct epoll_event *events;
146static int eventmax;
147#endif
148
149#if EV_USE_KQUEUE
150static int kqueue_fd;
151static struct kevent *kqueue_changes;
152static int kqueue_changemax, kqueue_changecnt;
153static struct kevent *kqueue_events;
154static int kqueue_eventmax;
155#endif
127 156
128/*****************************************************************************/ 157/*****************************************************************************/
129 158
130ev_tstamp 159inline ev_tstamp
131ev_time (void) 160ev_time (void)
132{ 161{
133#if EV_USE_REALTIME 162#if EV_USE_REALTIME
134 struct timespec ts; 163 struct timespec ts;
135 clock_gettime (CLOCK_REALTIME, &ts); 164 clock_gettime (CLOCK_REALTIME, &ts);
… …
139 gettimeofday (&tv, 0); 168 gettimeofday (&tv, 0);
140 return tv.tv_sec + tv.tv_usec * 1e-6; 169 return tv.tv_sec + tv.tv_usec * 1e-6;
141#endif 170#endif
142} 171}
143 172
144static ev_tstamp 173inline ev_tstamp
145get_clock (void) 174get_clock (void)
146{ 175{
147#if EV_USE_MONOTONIC 176#if EV_USE_MONOTONIC
148 if (expect_true (have_monotonic)) 177 if (expect_true (have_monotonic))
149 { 178 {
… …
152 return ts.tv_sec + ts.tv_nsec * 1e-9; 181 return ts.tv_sec + ts.tv_nsec * 1e-9;
153 } 182 }
154#endif 183#endif
155 184
156 return ev_time (); 185 return ev_time ();
186}
187
188ev_tstamp
189ev_now (EV_P)
190{
191 return rt_now;
157} 192}
158 193
159#define array_roundsize(base,n) ((n) | 4 & ~3) 194#define array_roundsize(base,n) ((n) | 4 & ~3)
160 195
161#define array_needsize(base,cur,cnt,init) \ 196#define array_needsize(base,cur,cnt,init) \
… …
206 241
207static ANPENDING *pendings [NUMPRI]; 242static ANPENDING *pendings [NUMPRI];
208static int pendingmax [NUMPRI], pendingcnt [NUMPRI]; 243static int pendingmax [NUMPRI], pendingcnt [NUMPRI];
209 244
210static void 245static void
211event (W w, int events) 246event (EV_P_ W w, int events)
212{ 247{
213 if (w->pending) 248 if (w->pending)
214 { 249 {
215 pendings [ABSPRI (w)][w->pending - 1].events |= events; 250 pendings [ABSPRI (w)][w->pending - 1].events |= events;
216 return; 251 return;
… …
221 pendings [ABSPRI (w)][w->pending - 1].w = w; 256 pendings [ABSPRI (w)][w->pending - 1].w = w;
222 pendings [ABSPRI (w)][w->pending - 1].events = events; 257 pendings [ABSPRI (w)][w->pending - 1].events = events;
223} 258}
224 259
225static void 260static void
226queue_events (W *events, int eventcnt, int type) 261queue_events (EV_P_ W *events, int eventcnt, int type)
227{ 262{
228 int i; 263 int i;
229 264
230 for (i = 0; i < eventcnt; ++i) 265 for (i = 0; i < eventcnt; ++i)
231 event (events [i], type); 266 event (EV_A_ events [i], type);
232} 267}
233 268
234static void 269static void
235fd_event (int fd, int events) 270fd_event (EV_P_ int fd, int events)
236{ 271{
237 ANFD *anfd = anfds + fd; 272 ANFD *anfd = anfds + fd;
238 struct ev_io *w; 273 struct ev_io *w;
239 274
240 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 275 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
241 { 276 {
242 int ev = w->events & events; 277 int ev = w->events & events;
243 278
244 if (ev) 279 if (ev)
245 event ((W)w, ev); 280 event (EV_A_ (W)w, ev);
246 } 281 }
247} 282}
248 283
249/*****************************************************************************/ 284/*****************************************************************************/
250 285
251static int *fdchanges; 286static int *fdchanges;
252static int fdchangemax, fdchangecnt; 287static int fdchangemax, fdchangecnt;
253 288
254static void 289static void
255fd_reify (void) 290fd_reify (EV_P)
256{ 291{
257 int i; 292 int i;
258 293
259 for (i = 0; i < fdchangecnt; ++i) 294 for (i = 0; i < fdchangecnt; ++i)
260 { 295 {
… …
269 304
270 anfd->reify = 0; 305 anfd->reify = 0;
271 306
272 if (anfd->events != events) 307 if (anfd->events != events)
273 { 308 {
274 method_modify (fd, anfd->events, events); 309 method_modify (EV_A_ fd, anfd->events, events);
275 anfd->events = events; 310 anfd->events = events;
276 } 311 }
277 } 312 }
278 313
279 fdchangecnt = 0; 314 fdchangecnt = 0;
280} 315}
281 316
282static void 317static void
283fd_change (int fd) 318fd_change (EV_P_ int fd)
284{ 319{
285 if (anfds [fd].reify || fdchangecnt < 0) 320 if (anfds [fd].reify || fdchangecnt < 0)
286 return; 321 return;
287 322
288 anfds [fd].reify = 1; 323 anfds [fd].reify = 1;
… …
291 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 326 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
292 fdchanges [fdchangecnt - 1] = fd; 327 fdchanges [fdchangecnt - 1] = fd;
293} 328}
294 329
295static void 330static void
296fd_kill (int fd) 331fd_kill (EV_P_ int fd)
297{ 332{
298 struct ev_io *w; 333 struct ev_io *w;
299 334
300 while ((w = (struct ev_io *)anfds [fd].head)) 335 while ((w = (struct ev_io *)anfds [fd].head))
301 { 336 {
302 ev_io_stop (w); 337 ev_io_stop (EV_A_ w);
303 event ((W)w, EV_ERROR | EV_READ | EV_WRITE); 338 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
304 } 339 }
305} 340}
306 341
307/* called on EBADF to verify fds */ 342/* called on EBADF to verify fds */
308static void 343static void
309fd_ebadf (void) 344fd_ebadf (EV_P)
310{ 345{
311 int fd; 346 int fd;
312 347
313 for (fd = 0; fd < anfdmax; ++fd) 348 for (fd = 0; fd < anfdmax; ++fd)
314 if (anfds [fd].events) 349 if (anfds [fd].events)
315 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 350 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
316 fd_kill (fd); 351 fd_kill (EV_A_ fd);
317} 352}
318 353
319/* called on ENOMEM in select/poll to kill some fds and retry */ 354/* called on ENOMEM in select/poll to kill some fds and retry */
320static void 355static void
321fd_enomem (void) 356fd_enomem (EV_P)
322{ 357{
323 int fd = anfdmax; 358 int fd = anfdmax;
324 359
325 while (fd--) 360 while (fd--)
326 if (anfds [fd].events) 361 if (anfds [fd].events)
327 { 362 {
328 close (fd); 363 close (fd);
329 fd_kill (fd); 364 fd_kill (EV_A_ fd);
330 return; 365 return;
331 } 366 }
332} 367}
333 368
334/*****************************************************************************/ 369/*****************************************************************************/
… …
420 errno = old_errno; 455 errno = old_errno;
421 } 456 }
422} 457}
423 458
424static void 459static void
425sigcb (struct ev_io *iow, int revents) 460sigcb (EV_P_ struct ev_io *iow, int revents)
426{ 461{
427 struct ev_watcher_list *w; 462 struct ev_watcher_list *w;
428 int signum; 463 int signum;
429 464
430 read (sigpipe [0], &revents, 1); 465 read (sigpipe [0], &revents, 1);
… …
434 if (signals [signum].gotsig) 469 if (signals [signum].gotsig)
435 { 470 {
436 signals [signum].gotsig = 0; 471 signals [signum].gotsig = 0;
437 472
438 for (w = signals [signum].head; w; w = w->next) 473 for (w = signals [signum].head; w; w = w->next)
439 event ((W)w, EV_SIGNAL); 474 event (EV_A_ (W)w, EV_SIGNAL);
440 } 475 }
441} 476}
442 477
443static void 478static void
444siginit (void) 479siginit (EV_P)
445{ 480{
446#ifndef WIN32 481#ifndef WIN32
447 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 482 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
448 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC); 483 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
449 484
… …
452 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 487 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
453#endif 488#endif
454 489
455 ev_io_set (&sigev, sigpipe [0], EV_READ); 490 ev_io_set (&sigev, sigpipe [0], EV_READ);
456 ev_io_start (&sigev); 491 ev_io_start (&sigev);
492 ev_unref (EV_A); /* child watcher should not keep loop alive */
457} 493}
458 494
459/*****************************************************************************/ 495/*****************************************************************************/
460 496
461static struct ev_idle **idles; 497static struct ev_idle **idles;
… …
477#ifndef WCONTINUED 513#ifndef WCONTINUED
478# define WCONTINUED 0 514# define WCONTINUED 0
479#endif 515#endif
480 516
481static void 517static void
482child_reap (struct ev_signal *sw, int chain, int pid, int status) 518child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status)
483{ 519{
484 struct ev_child *w; 520 struct ev_child *w;
485 521
486 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 522 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
487 if (w->pid == pid || !w->pid) 523 if (w->pid == pid || !w->pid)
488 { 524 {
489 w->priority = sw->priority; /* need to do it *now* */ 525 w->priority = sw->priority; /* need to do it *now* */
490 w->rpid = pid; 526 w->rpid = pid;
491 w->rstatus = status; 527 w->rstatus = status;
492 event ((W)w, EV_CHILD); 528 event (EV_A_ (W)w, EV_CHILD);
493 } 529 }
494} 530}
495 531
496static void 532static void
497childcb (struct ev_signal *sw, int revents) 533childcb (EV_P_ struct ev_signal *sw, int revents)
498{ 534{
499 int pid, status; 535 int pid, status;
500 536
501 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 537 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
502 { 538 {
503 /* make sure we are called again until all childs have been reaped */ 539 /* make sure we are called again until all childs have been reaped */
504 event ((W)sw, EV_SIGNAL); 540 event (EV_A_ (W)sw, EV_SIGNAL);
505 541
506 child_reap (sw, pid, pid, status); 542 child_reap (EV_A_ sw, pid, pid, status);
507 child_reap (sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 543 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
508 } 544 }
509} 545}
510 546
511#endif 547#endif
512 548
… …
516# include "ev_kqueue.c" 552# include "ev_kqueue.c"
517#endif 553#endif
518#if EV_USE_EPOLL 554#if EV_USE_EPOLL
519# include "ev_epoll.c" 555# include "ev_epoll.c"
520#endif 556#endif
521#if EV_USE_POLL 557#if EV_USEV_POLL
522# include "ev_poll.c" 558# include "ev_poll.c"
523#endif 559#endif
524#if EV_USE_SELECT 560#if EV_USE_SELECT
525# include "ev_select.c" 561# include "ev_select.c"
526#endif 562#endif
… …
537 return EV_VERSION_MINOR; 573 return EV_VERSION_MINOR;
538} 574}
539 575
540/* return true if we are running with elevated privileges and should ignore env variables */ 576/* return true if we are running with elevated privileges and should ignore env variables */
541static int 577static int
542enable_secure () 578enable_secure (void)
543{ 579{
544#ifdef WIN32 580#ifdef WIN32
545 return 0; 581 return 0;
546#else 582#else
547 return getuid () != geteuid () 583 return getuid () != geteuid ()
548 || getgid () != getegid (); 584 || getgid () != getegid ();
549#endif 585#endif
550} 586}
551 587
588int
589ev_method (EV_P)
590{
591 return method;
592}
593
594int
552int ev_init (int methods) 595ev_init (EV_P_ int methods)
553{ 596{
554 if (!ev_method) 597 if (!method)
555 { 598 {
556#if EV_USE_MONOTONIC 599#if EV_USE_MONOTONIC
557 { 600 {
558 struct timespec ts; 601 struct timespec ts;
559 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 602 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
560 have_monotonic = 1; 603 have_monotonic = 1;
561 } 604 }
562#endif 605#endif
563 606
564 ev_now = ev_time (); 607 rt_now = ev_time ();
565 now = get_clock (); 608 mn_now = get_clock ();
566 now_floor = now; 609 now_floor = mn_now;
567 diff = ev_now - now; 610 diff = rt_now - mn_now;
568 611
569 if (pipe (sigpipe)) 612 if (pipe (sigpipe))
570 return 0; 613 return 0;
571 614
572 if (methods == EVMETHOD_AUTO) 615 if (methods == EVMETHOD_AUTO)
573 if (!enable_secure () && getenv ("LIBEV_METHODS")) 616 if (!enable_secure () && getenv ("LIBmethodS"))
574 methods = atoi (getenv ("LIBEV_METHODS")); 617 methods = atoi (getenv ("LIBmethodS"));
575 else 618 else
576 methods = EVMETHOD_ANY; 619 methods = EVMETHOD_ANY;
577 620
578 ev_method = 0; 621 method = 0;
579#if EV_USE_KQUEUE 622#if EV_USE_KQUEUE
580 if (!ev_method && (methods & EVMETHOD_KQUEUE)) kqueue_init (methods); 623 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
581#endif 624#endif
582#if EV_USE_EPOLL 625#if EV_USE_EPOLL
583 if (!ev_method && (methods & EVMETHOD_EPOLL )) epoll_init (methods); 626 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
584#endif 627#endif
585#if EV_USE_POLL 628#if EV_USEV_POLL
586 if (!ev_method && (methods & EVMETHOD_POLL )) poll_init (methods); 629 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
587#endif 630#endif
588#if EV_USE_SELECT 631#if EV_USE_SELECT
589 if (!ev_method && (methods & EVMETHOD_SELECT)) select_init (methods); 632 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
590#endif 633#endif
591 634
592 if (ev_method) 635 if (method)
593 { 636 {
594 ev_watcher_init (&sigev, sigcb); 637 ev_watcher_init (&sigev, sigcb);
595 ev_set_priority (&sigev, EV_MAXPRI); 638 ev_set_priority (&sigev, EV_MAXPRI);
596 siginit (); 639 siginit (EV_A);
597 640
598#ifndef WIN32 641#ifndef WIN32
599 ev_signal_init (&childev, childcb, SIGCHLD); 642 ev_signal_init (&childev, childcb, SIGCHLD);
600 ev_set_priority (&childev, EV_MAXPRI); 643 ev_set_priority (&childev, EV_MAXPRI);
601 ev_signal_start (&childev); 644 ev_signal_start (EV_A_ &childev);
645 ev_unref (EV_A); /* child watcher should not keep loop alive */
602#endif 646#endif
603 } 647 }
604 } 648 }
605 649
606 return ev_method; 650 return method;
607} 651}
608 652
609/*****************************************************************************/ 653/*****************************************************************************/
610 654
611void 655void
… …
622 666
623void 667void
624ev_fork_child (void) 668ev_fork_child (void)
625{ 669{
626#if EV_USE_EPOLL 670#if EV_USE_EPOLL
627 if (ev_method == EVMETHOD_EPOLL) 671 if (method == EVMETHOD_EPOLL)
628 epoll_postfork_child (); 672 epoll_postfork_child ();
629#endif 673#endif
630 674
631 ev_io_stop (&sigev); 675 ev_io_stop (&sigev);
632 close (sigpipe [0]); 676 close (sigpipe [0]);
… …
636} 680}
637 681
638/*****************************************************************************/ 682/*****************************************************************************/
639 683
640static void 684static void
641call_pending (void) 685call_pending (EV_P)
642{ 686{
643 int pri; 687 int pri;
644 688
645 for (pri = NUMPRI; pri--; ) 689 for (pri = NUMPRI; pri--; )
646 while (pendingcnt [pri]) 690 while (pendingcnt [pri])
… …
648 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 692 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
649 693
650 if (p->w) 694 if (p->w)
651 { 695 {
652 p->w->pending = 0; 696 p->w->pending = 0;
653 p->w->cb (p->w, p->events); 697 p->w->cb (EV_A_ p->w, p->events);
654 } 698 }
655 } 699 }
656} 700}
657 701
658static void 702static void
659timers_reify (void) 703timers_reify (EV_P)
660{ 704{
661 while (timercnt && timers [0]->at <= now) 705 while (timercnt && timers [0]->at <= mn_now)
662 { 706 {
663 struct ev_timer *w = timers [0]; 707 struct ev_timer *w = timers [0];
664 708
665 /* first reschedule or stop timer */ 709 /* first reschedule or stop timer */
666 if (w->repeat) 710 if (w->repeat)
667 { 711 {
668 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 712 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
669 w->at = now + w->repeat; 713 w->at = mn_now + w->repeat;
670 downheap ((WT *)timers, timercnt, 0); 714 downheap ((WT *)timers, timercnt, 0);
671 } 715 }
672 else 716 else
673 ev_timer_stop (w); /* nonrepeating: stop timer */ 717 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
674 718
675 event ((W)w, EV_TIMEOUT); 719 event ((W)w, EV_TIMEOUT);
676 } 720 }
677} 721}
678 722
679static void 723static void
680periodics_reify (void) 724periodics_reify (EV_P)
681{ 725{
682 while (periodiccnt && periodics [0]->at <= ev_now) 726 while (periodiccnt && periodics [0]->at <= rt_now)
683 { 727 {
684 struct ev_periodic *w = periodics [0]; 728 struct ev_periodic *w = periodics [0];
685 729
686 /* first reschedule or stop timer */ 730 /* first reschedule or stop timer */
687 if (w->interval) 731 if (w->interval)
688 { 732 {
689 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval; 733 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval;
690 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > ev_now)); 734 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now));
691 downheap ((WT *)periodics, periodiccnt, 0); 735 downheap ((WT *)periodics, periodiccnt, 0);
692 } 736 }
693 else 737 else
694 ev_periodic_stop (w); /* nonrepeating: stop timer */ 738 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
695 739
696 event ((W)w, EV_PERIODIC); 740 event (EV_A_ (W)w, EV_PERIODIC);
697 } 741 }
698} 742}
699 743
700static void 744static void
701periodics_reschedule (ev_tstamp diff) 745periodics_reschedule (EV_P_ ev_tstamp diff)
702{ 746{
703 int i; 747 int i;
704 748
705 /* adjust periodics after time jump */ 749 /* adjust periodics after time jump */
706 for (i = 0; i < periodiccnt; ++i) 750 for (i = 0; i < periodiccnt; ++i)
707 { 751 {
708 struct ev_periodic *w = periodics [i]; 752 struct ev_periodic *w = periodics [i];
709 753
710 if (w->interval) 754 if (w->interval)
711 { 755 {
712 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval; 756 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval;
713 757
714 if (fabs (diff) >= 1e-4) 758 if (fabs (diff) >= 1e-4)
715 { 759 {
716 ev_periodic_stop (w); 760 ev_periodic_stop (EV_A_ w);
717 ev_periodic_start (w); 761 ev_periodic_start (EV_A_ w);
718 762
719 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 763 i = 0; /* restart loop, inefficient, but time jumps should be rare */
720 } 764 }
721 } 765 }
722 } 766 }
723} 767}
724 768
725static int 769inline int
726time_update_monotonic (void) 770time_update_monotonic (EV_P)
727{ 771{
728 now = get_clock (); 772 mn_now = get_clock ();
729 773
730 if (expect_true (now - now_floor < MIN_TIMEJUMP * .5)) 774 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
731 { 775 {
732 ev_now = now + diff; 776 rt_now = mn_now + diff;
733 return 0; 777 return 0;
734 } 778 }
735 else 779 else
736 { 780 {
737 now_floor = now; 781 now_floor = mn_now;
738 ev_now = ev_time (); 782 rt_now = ev_time ();
739 return 1; 783 return 1;
740 } 784 }
741} 785}
742 786
743static void 787static void
744time_update (void) 788time_update (EV_P)
745{ 789{
746 int i; 790 int i;
747 791
748#if EV_USE_MONOTONIC 792#if EV_USE_MONOTONIC
749 if (expect_true (have_monotonic)) 793 if (expect_true (have_monotonic))
750 { 794 {
751 if (time_update_monotonic ()) 795 if (time_update_monotonic (EV_A))
752 { 796 {
753 ev_tstamp odiff = diff; 797 ev_tstamp odiff = diff;
754 798
755 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 799 for (i = 4; --i; ) /* loop a few times, before making important decisions */
756 { 800 {
757 diff = ev_now - now; 801 diff = rt_now - mn_now;
758 802
759 if (fabs (odiff - diff) < MIN_TIMEJUMP) 803 if (fabs (odiff - diff) < MIN_TIMEJUMP)
760 return; /* all is well */ 804 return; /* all is well */
761 805
762 ev_now = ev_time (); 806 rt_now = ev_time ();
763 now = get_clock (); 807 mn_now = get_clock ();
764 now_floor = now; 808 now_floor = mn_now;
765 } 809 }
766 810
767 periodics_reschedule (diff - odiff); 811 periodics_reschedule (EV_A_ diff - odiff);
768 /* no timer adjustment, as the monotonic clock doesn't jump */ 812 /* no timer adjustment, as the monotonic clock doesn't jump */
769 } 813 }
770 } 814 }
771 else 815 else
772#endif 816#endif
773 { 817 {
774 ev_now = ev_time (); 818 rt_now = ev_time ();
775 819
776 if (expect_false (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 820 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
777 { 821 {
778 periodics_reschedule (ev_now - now); 822 periodics_reschedule (EV_A_ rt_now - mn_now);
779 823
780 /* adjust timers. this is easy, as the offset is the same for all */ 824 /* adjust timers. this is easy, as the offset is the same for all */
781 for (i = 0; i < timercnt; ++i) 825 for (i = 0; i < timercnt; ++i)
782 timers [i]->at += diff; 826 timers [i]->at += diff;
783 } 827 }
784 828
785 now = ev_now; 829 mn_now = rt_now;
786 } 830 }
787} 831}
788 832
789int ev_loop_done; 833void
834ev_ref (EV_P)
835{
836 ++activecnt;
837}
790 838
839void
840ev_unref (EV_P)
841{
842 --activecnt;
843}
844
845static int loop_done;
846
847void
791void ev_loop (int flags) 848ev_loop (EV_P_ int flags)
792{ 849{
793 double block; 850 double block;
794 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 851 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
795 852
796 do 853 do
797 { 854 {
798 /* queue check watchers (and execute them) */ 855 /* queue check watchers (and execute them) */
799 if (expect_false (preparecnt)) 856 if (expect_false (preparecnt))
800 { 857 {
801 queue_events ((W *)prepares, preparecnt, EV_PREPARE); 858 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
802 call_pending (); 859 call_pending (EV_A);
803 } 860 }
804 861
805 /* update fd-related kernel structures */ 862 /* update fd-related kernel structures */
806 fd_reify (); 863 fd_reify (EV_A);
807 864
808 /* calculate blocking time */ 865 /* calculate blocking time */
809 866
810 /* we only need this for !monotonic clockor timers, but as we basically 867 /* we only need this for !monotonic clockor timers, but as we basically
811 always have timers, we just calculate it always */ 868 always have timers, we just calculate it always */
812#if EV_USE_MONOTONIC 869#if EV_USE_MONOTONIC
813 if (expect_true (have_monotonic)) 870 if (expect_true (have_monotonic))
814 time_update_monotonic (); 871 time_update_monotonic (EV_A);
815 else 872 else
816#endif 873#endif
817 { 874 {
818 ev_now = ev_time (); 875 rt_now = ev_time ();
819 now = ev_now; 876 mn_now = rt_now;
820 } 877 }
821 878
822 if (flags & EVLOOP_NONBLOCK || idlecnt) 879 if (flags & EVLOOP_NONBLOCK || idlecnt)
823 block = 0.; 880 block = 0.;
824 else 881 else
825 { 882 {
826 block = MAX_BLOCKTIME; 883 block = MAX_BLOCKTIME;
827 884
828 if (timercnt) 885 if (timercnt)
829 { 886 {
830 ev_tstamp to = timers [0]->at - now + method_fudge; 887 ev_tstamp to = timers [0]->at - mn_now + method_fudge;
831 if (block > to) block = to; 888 if (block > to) block = to;
832 } 889 }
833 890
834 if (periodiccnt) 891 if (periodiccnt)
835 { 892 {
836 ev_tstamp to = periodics [0]->at - ev_now + method_fudge; 893 ev_tstamp to = periodics [0]->at - rt_now + method_fudge;
837 if (block > to) block = to; 894 if (block > to) block = to;
838 } 895 }
839 896
840 if (block < 0.) block = 0.; 897 if (block < 0.) block = 0.;
841 } 898 }
842 899
843 method_poll (block); 900 method_poll (EV_A_ block);
844 901
845 /* update ev_now, do magic */ 902 /* update rt_now, do magic */
846 time_update (); 903 time_update (EV_A);
847 904
848 /* queue pending timers and reschedule them */ 905 /* queue pending timers and reschedule them */
849 timers_reify (); /* relative timers called last */ 906 timers_reify (EV_A); /* relative timers called last */
850 periodics_reify (); /* absolute timers called first */ 907 periodics_reify (EV_A); /* absolute timers called first */
851 908
852 /* queue idle watchers unless io or timers are pending */ 909 /* queue idle watchers unless io or timers are pending */
853 if (!pendingcnt) 910 if (!pendingcnt)
854 queue_events ((W *)idles, idlecnt, EV_IDLE); 911 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
855 912
856 /* queue check watchers, to be executed first */ 913 /* queue check watchers, to be executed first */
857 if (checkcnt) 914 if (checkcnt)
858 queue_events ((W *)checks, checkcnt, EV_CHECK); 915 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
859 916
860 call_pending (); 917 call_pending (EV_A);
861 } 918 }
862 while (!ev_loop_done); 919 while (activecnt && !loop_done);
863 920
864 if (ev_loop_done != 2) 921 if (loop_done != 2)
865 ev_loop_done = 0; 922 loop_done = 0;
923}
924
925void
926ev_unloop (EV_P_ int how)
927{
928 loop_done = how;
866} 929}
867 930
868/*****************************************************************************/ 931/*****************************************************************************/
869 932
870static void 933inline void
871wlist_add (WL *head, WL elem) 934wlist_add (WL *head, WL elem)
872{ 935{
873 elem->next = *head; 936 elem->next = *head;
874 *head = elem; 937 *head = elem;
875} 938}
876 939
877static void 940inline void
878wlist_del (WL *head, WL elem) 941wlist_del (WL *head, WL elem)
879{ 942{
880 while (*head) 943 while (*head)
881 { 944 {
882 if (*head == elem) 945 if (*head == elem)
… …
887 950
888 head = &(*head)->next; 951 head = &(*head)->next;
889 } 952 }
890} 953}
891 954
892static void 955inline void
893ev_clear_pending (W w) 956ev_clear_pending (EV_P_ W w)
894{ 957{
895 if (w->pending) 958 if (w->pending)
896 { 959 {
897 pendings [ABSPRI (w)][w->pending - 1].w = 0; 960 pendings [ABSPRI (w)][w->pending - 1].w = 0;
898 w->pending = 0; 961 w->pending = 0;
899 } 962 }
900} 963}
901 964
902static void 965inline void
903ev_start (W w, int active) 966ev_start (EV_P_ W w, int active)
904{ 967{
905 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 968 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
906 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI; 969 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
907 970
908 w->active = active; 971 w->active = active;
972 ev_ref (EV_A);
909} 973}
910 974
911static void 975inline void
912ev_stop (W w) 976ev_stop (EV_P_ W w)
913{ 977{
978 ev_unref (EV_A);
914 w->active = 0; 979 w->active = 0;
915} 980}
916 981
917/*****************************************************************************/ 982/*****************************************************************************/
918 983
919void 984void
920ev_io_start (struct ev_io *w) 985ev_io_start (EV_P_ struct ev_io *w)
921{ 986{
922 int fd = w->fd; 987 int fd = w->fd;
923 988
924 if (ev_is_active (w)) 989 if (ev_is_active (w))
925 return; 990 return;
926 991
927 assert (("ev_io_start called with negative fd", fd >= 0)); 992 assert (("ev_io_start called with negative fd", fd >= 0));
928 993
929 ev_start ((W)w, 1); 994 ev_start (EV_A_ (W)w, 1);
930 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 995 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
931 wlist_add ((WL *)&anfds[fd].head, (WL)w); 996 wlist_add ((WL *)&anfds[fd].head, (WL)w);
932 997
933 fd_change (fd); 998 fd_change (EV_A_ fd);
934} 999}
935 1000
936void 1001void
937ev_io_stop (struct ev_io *w) 1002ev_io_stop (EV_P_ struct ev_io *w)
938{ 1003{
939 ev_clear_pending ((W)w); 1004 ev_clear_pending (EV_A_ (W)w);
940 if (!ev_is_active (w)) 1005 if (!ev_is_active (w))
941 return; 1006 return;
942 1007
943 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1008 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
944 ev_stop ((W)w); 1009 ev_stop (EV_A_ (W)w);
945 1010
946 fd_change (w->fd); 1011 fd_change (EV_A_ w->fd);
947} 1012}
948 1013
949void 1014void
950ev_timer_start (struct ev_timer *w) 1015ev_timer_start (EV_P_ struct ev_timer *w)
951{ 1016{
952 if (ev_is_active (w)) 1017 if (ev_is_active (w))
953 return; 1018 return;
954 1019
955 w->at += now; 1020 w->at += mn_now;
956 1021
957 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1022 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
958 1023
959 ev_start ((W)w, ++timercnt); 1024 ev_start (EV_A_ (W)w, ++timercnt);
960 array_needsize (timers, timermax, timercnt, ); 1025 array_needsize (timers, timermax, timercnt, );
961 timers [timercnt - 1] = w; 1026 timers [timercnt - 1] = w;
962 upheap ((WT *)timers, timercnt - 1); 1027 upheap ((WT *)timers, timercnt - 1);
963} 1028}
964 1029
965void 1030void
966ev_timer_stop (struct ev_timer *w) 1031ev_timer_stop (EV_P_ struct ev_timer *w)
967{ 1032{
968 ev_clear_pending ((W)w); 1033 ev_clear_pending (EV_A_ (W)w);
969 if (!ev_is_active (w)) 1034 if (!ev_is_active (w))
970 return; 1035 return;
971 1036
972 if (w->active < timercnt--) 1037 if (w->active < timercnt--)
973 { 1038 {
… …
975 downheap ((WT *)timers, timercnt, w->active - 1); 1040 downheap ((WT *)timers, timercnt, w->active - 1);
976 } 1041 }
977 1042
978 w->at = w->repeat; 1043 w->at = w->repeat;
979 1044
980 ev_stop ((W)w); 1045 ev_stop (EV_A_ (W)w);
981} 1046}
982 1047
983void 1048void
984ev_timer_again (struct ev_timer *w) 1049ev_timer_again (EV_P_ struct ev_timer *w)
985{ 1050{
986 if (ev_is_active (w)) 1051 if (ev_is_active (w))
987 { 1052 {
988 if (w->repeat) 1053 if (w->repeat)
989 { 1054 {
990 w->at = now + w->repeat; 1055 w->at = mn_now + w->repeat;
991 downheap ((WT *)timers, timercnt, w->active - 1); 1056 downheap ((WT *)timers, timercnt, w->active - 1);
992 } 1057 }
993 else 1058 else
994 ev_timer_stop (w); 1059 ev_timer_stop (EV_A_ w);
995 } 1060 }
996 else if (w->repeat) 1061 else if (w->repeat)
997 ev_timer_start (w); 1062 ev_timer_start (EV_A_ w);
998} 1063}
999 1064
1000void 1065void
1001ev_periodic_start (struct ev_periodic *w) 1066ev_periodic_start (EV_P_ struct ev_periodic *w)
1002{ 1067{
1003 if (ev_is_active (w)) 1068 if (ev_is_active (w))
1004 return; 1069 return;
1005 1070
1006 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1071 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1007 1072
1008 /* this formula differs from the one in periodic_reify because we do not always round up */ 1073 /* this formula differs from the one in periodic_reify because we do not always round up */
1009 if (w->interval) 1074 if (w->interval)
1010 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval; 1075 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval;
1011 1076
1012 ev_start ((W)w, ++periodiccnt); 1077 ev_start (EV_A_ (W)w, ++periodiccnt);
1013 array_needsize (periodics, periodicmax, periodiccnt, ); 1078 array_needsize (periodics, periodicmax, periodiccnt, );
1014 periodics [periodiccnt - 1] = w; 1079 periodics [periodiccnt - 1] = w;
1015 upheap ((WT *)periodics, periodiccnt - 1); 1080 upheap ((WT *)periodics, periodiccnt - 1);
1016} 1081}
1017 1082
1018void 1083void
1019ev_periodic_stop (struct ev_periodic *w) 1084ev_periodic_stop (EV_P_ struct ev_periodic *w)
1020{ 1085{
1021 ev_clear_pending ((W)w); 1086 ev_clear_pending (EV_A_ (W)w);
1022 if (!ev_is_active (w)) 1087 if (!ev_is_active (w))
1023 return; 1088 return;
1024 1089
1025 if (w->active < periodiccnt--) 1090 if (w->active < periodiccnt--)
1026 { 1091 {
1027 periodics [w->active - 1] = periodics [periodiccnt]; 1092 periodics [w->active - 1] = periodics [periodiccnt];
1028 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1093 downheap ((WT *)periodics, periodiccnt, w->active - 1);
1029 } 1094 }
1030 1095
1031 ev_stop ((W)w); 1096 ev_stop (EV_A_ (W)w);
1032} 1097}
1033 1098
1034#ifndef SA_RESTART 1099#ifndef SA_RESTART
1035# define SA_RESTART 0 1100# define SA_RESTART 0
1036#endif 1101#endif
1037 1102
1038void 1103void
1039ev_signal_start (struct ev_signal *w) 1104ev_signal_start (EV_P_ struct ev_signal *w)
1040{ 1105{
1041 if (ev_is_active (w)) 1106 if (ev_is_active (w))
1042 return; 1107 return;
1043 1108
1044 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1109 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1045 1110
1046 ev_start ((W)w, 1); 1111 ev_start (EV_A_ (W)w, 1);
1047 array_needsize (signals, signalmax, w->signum, signals_init); 1112 array_needsize (signals, signalmax, w->signum, signals_init);
1048 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1113 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1049 1114
1050 if (!w->next) 1115 if (!w->next)
1051 { 1116 {
… …
1056 sigaction (w->signum, &sa, 0); 1121 sigaction (w->signum, &sa, 0);
1057 } 1122 }
1058} 1123}
1059 1124
1060void 1125void
1061ev_signal_stop (struct ev_signal *w) 1126ev_signal_stop (EV_P_ struct ev_signal *w)
1062{ 1127{
1063 ev_clear_pending ((W)w); 1128 ev_clear_pending (EV_A_ (W)w);
1064 if (!ev_is_active (w)) 1129 if (!ev_is_active (w))
1065 return; 1130 return;
1066 1131
1067 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1132 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1068 ev_stop ((W)w); 1133 ev_stop (EV_A_ (W)w);
1069 1134
1070 if (!signals [w->signum - 1].head) 1135 if (!signals [w->signum - 1].head)
1071 signal (w->signum, SIG_DFL); 1136 signal (w->signum, SIG_DFL);
1072} 1137}
1073 1138
1074void 1139void
1075ev_idle_start (struct ev_idle *w) 1140ev_idle_start (EV_P_ struct ev_idle *w)
1076{ 1141{
1077 if (ev_is_active (w)) 1142 if (ev_is_active (w))
1078 return; 1143 return;
1079 1144
1080 ev_start ((W)w, ++idlecnt); 1145 ev_start (EV_A_ (W)w, ++idlecnt);
1081 array_needsize (idles, idlemax, idlecnt, ); 1146 array_needsize (idles, idlemax, idlecnt, );
1082 idles [idlecnt - 1] = w; 1147 idles [idlecnt - 1] = w;
1083} 1148}
1084 1149
1085void 1150void
1086ev_idle_stop (struct ev_idle *w) 1151ev_idle_stop (EV_P_ struct ev_idle *w)
1087{ 1152{
1088 ev_clear_pending ((W)w); 1153 ev_clear_pending (EV_A_ (W)w);
1089 if (ev_is_active (w)) 1154 if (ev_is_active (w))
1090 return; 1155 return;
1091 1156
1092 idles [w->active - 1] = idles [--idlecnt]; 1157 idles [w->active - 1] = idles [--idlecnt];
1093 ev_stop ((W)w); 1158 ev_stop (EV_A_ (W)w);
1094} 1159}
1095 1160
1096void 1161void
1097ev_prepare_start (struct ev_prepare *w) 1162ev_prepare_start (EV_P_ struct ev_prepare *w)
1098{ 1163{
1099 if (ev_is_active (w)) 1164 if (ev_is_active (w))
1100 return; 1165 return;
1101 1166
1102 ev_start ((W)w, ++preparecnt); 1167 ev_start (EV_A_ (W)w, ++preparecnt);
1103 array_needsize (prepares, preparemax, preparecnt, ); 1168 array_needsize (prepares, preparemax, preparecnt, );
1104 prepares [preparecnt - 1] = w; 1169 prepares [preparecnt - 1] = w;
1105} 1170}
1106 1171
1107void 1172void
1108ev_prepare_stop (struct ev_prepare *w) 1173ev_prepare_stop (EV_P_ struct ev_prepare *w)
1109{ 1174{
1110 ev_clear_pending ((W)w); 1175 ev_clear_pending (EV_A_ (W)w);
1111 if (ev_is_active (w)) 1176 if (ev_is_active (w))
1112 return; 1177 return;
1113 1178
1114 prepares [w->active - 1] = prepares [--preparecnt]; 1179 prepares [w->active - 1] = prepares [--preparecnt];
1115 ev_stop ((W)w); 1180 ev_stop (EV_A_ (W)w);
1116} 1181}
1117 1182
1118void 1183void
1119ev_check_start (struct ev_check *w) 1184ev_check_start (EV_P_ struct ev_check *w)
1120{ 1185{
1121 if (ev_is_active (w)) 1186 if (ev_is_active (w))
1122 return; 1187 return;
1123 1188
1124 ev_start ((W)w, ++checkcnt); 1189 ev_start (EV_A_ (W)w, ++checkcnt);
1125 array_needsize (checks, checkmax, checkcnt, ); 1190 array_needsize (checks, checkmax, checkcnt, );
1126 checks [checkcnt - 1] = w; 1191 checks [checkcnt - 1] = w;
1127} 1192}
1128 1193
1129void 1194void
1130ev_check_stop (struct ev_check *w) 1195ev_check_stop (EV_P_ struct ev_check *w)
1131{ 1196{
1132 ev_clear_pending ((W)w); 1197 ev_clear_pending (EV_A_ (W)w);
1133 if (ev_is_active (w)) 1198 if (ev_is_active (w))
1134 return; 1199 return;
1135 1200
1136 checks [w->active - 1] = checks [--checkcnt]; 1201 checks [w->active - 1] = checks [--checkcnt];
1137 ev_stop ((W)w); 1202 ev_stop (EV_A_ (W)w);
1138} 1203}
1139 1204
1140void 1205void
1141ev_child_start (struct ev_child *w) 1206ev_child_start (EV_P_ struct ev_child *w)
1142{ 1207{
1143 if (ev_is_active (w)) 1208 if (ev_is_active (w))
1144 return; 1209 return;
1145 1210
1146 ev_start ((W)w, 1); 1211 ev_start (EV_A_ (W)w, 1);
1147 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1212 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1148} 1213}
1149 1214
1150void 1215void
1151ev_child_stop (struct ev_child *w) 1216ev_child_stop (EV_P_ struct ev_child *w)
1152{ 1217{
1153 ev_clear_pending ((W)w); 1218 ev_clear_pending (EV_A_ (W)w);
1154 if (ev_is_active (w)) 1219 if (ev_is_active (w))
1155 return; 1220 return;
1156 1221
1157 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1222 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1158 ev_stop ((W)w); 1223 ev_stop (EV_A_ (W)w);
1159} 1224}
1160 1225
1161/*****************************************************************************/ 1226/*****************************************************************************/
1162 1227
1163struct ev_once 1228struct ev_once
… …
1167 void (*cb)(int revents, void *arg); 1232 void (*cb)(int revents, void *arg);
1168 void *arg; 1233 void *arg;
1169}; 1234};
1170 1235
1171static void 1236static void
1172once_cb (struct ev_once *once, int revents) 1237once_cb (EV_P_ struct ev_once *once, int revents)
1173{ 1238{
1174 void (*cb)(int revents, void *arg) = once->cb; 1239 void (*cb)(int revents, void *arg) = once->cb;
1175 void *arg = once->arg; 1240 void *arg = once->arg;
1176 1241
1177 ev_io_stop (&once->io); 1242 ev_io_stop (EV_A_ &once->io);
1178 ev_timer_stop (&once->to); 1243 ev_timer_stop (EV_A_ &once->to);
1179 free (once); 1244 free (once);
1180 1245
1181 cb (revents, arg); 1246 cb (revents, arg);
1182} 1247}
1183 1248
1184static void 1249static void
1185once_cb_io (struct ev_io *w, int revents) 1250once_cb_io (EV_P_ struct ev_io *w, int revents)
1186{ 1251{
1187 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 1252 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1188} 1253}
1189 1254
1190static void 1255static void
1191once_cb_to (struct ev_timer *w, int revents) 1256once_cb_to (EV_P_ struct ev_timer *w, int revents)
1192{ 1257{
1193 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 1258 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1194} 1259}
1195 1260
1196void 1261void
1197ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1262ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1198{ 1263{
1199 struct ev_once *once = malloc (sizeof (struct ev_once)); 1264 struct ev_once *once = malloc (sizeof (struct ev_once));
1200 1265
1201 if (!once) 1266 if (!once)
1202 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1267 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
… …
1207 1272
1208 ev_watcher_init (&once->io, once_cb_io); 1273 ev_watcher_init (&once->io, once_cb_io);
1209 if (fd >= 0) 1274 if (fd >= 0)
1210 { 1275 {
1211 ev_io_set (&once->io, fd, events); 1276 ev_io_set (&once->io, fd, events);
1212 ev_io_start (&once->io); 1277 ev_io_start (EV_A_ &once->io);
1213 } 1278 }
1214 1279
1215 ev_watcher_init (&once->to, once_cb_to); 1280 ev_watcher_init (&once->to, once_cb_to);
1216 if (timeout >= 0.) 1281 if (timeout >= 0.)
1217 { 1282 {
1218 ev_timer_set (&once->to, timeout, 0.); 1283 ev_timer_set (&once->to, timeout, 0.);
1219 ev_timer_start (&once->to); 1284 ev_timer_start (EV_A_ &once->to);
1220 } 1285 }
1221 } 1286 }
1222} 1287}
1223 1288
1224/*****************************************************************************/ 1289/*****************************************************************************/

Diff Legend

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