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

Comparing libev/ev.c (file contents):
Revision 1.49 by root, Sat Nov 3 16:16:58 2007 UTC vs.
Revision 1.51 by root, Sat Nov 3 21:58:51 2007 UTC

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

Diff Legend

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