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

Comparing libev/ev.c (file contents):
Revision 1.48 by root, Sat Nov 3 12:19:31 2007 UTC vs.
Revision 1.52 by root, Sat Nov 3 22:10:39 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
… …
453 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 487 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
454#endif 488#endif
455 489
456 ev_io_set (&sigev, sigpipe [0], EV_READ); 490 ev_io_set (&sigev, sigpipe [0], EV_READ);
457 ev_io_start (&sigev); 491 ev_io_start (&sigev);
492 ev_unref (EV_A); /* child watcher should not keep loop alive */
458} 493}
459 494
460/*****************************************************************************/ 495/*****************************************************************************/
461 496
462static struct ev_idle **idles; 497static struct ev_idle **idles;
… …
478#ifndef WCONTINUED 513#ifndef WCONTINUED
479# define WCONTINUED 0 514# define WCONTINUED 0
480#endif 515#endif
481 516
482static void 517static void
483child_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)
484{ 519{
485 struct ev_child *w; 520 struct ev_child *w;
486 521
487 for (w = childs [chain & (PID_HASHSIZE - 1)]; w; w = w->next) 522 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) 523 if (w->pid == pid || !w->pid)
489 { 524 {
490 w->priority = sw->priority; /* need to do it *now* */ 525 w->priority = sw->priority; /* need to do it *now* */
491 w->rpid = pid; 526 w->rpid = pid;
492 w->rstatus = status; 527 w->rstatus = status;
493 printf ("rpid %p %d %d\n", w, pid, w->pid);//D
494 event ((W)w, EV_CHILD); 528 event (EV_A_ (W)w, EV_CHILD);
495 } 529 }
496} 530}
497 531
498static void 532static void
499childcb (struct ev_signal *sw, int revents) 533childcb (EV_P_ struct ev_signal *sw, int revents)
500{ 534{
501 int pid, status; 535 int pid, status;
502 536
503 printf ("chld %x\n", revents);//D
504 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 537 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
505 { 538 {
506 /* 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 */
507 event ((W)sw, EV_SIGNAL); 540 event (EV_A_ (W)sw, EV_SIGNAL);
508 541
509 child_reap (sw, pid, pid, status); 542 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 */ 543 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
511 } 544 }
512} 545}
513 546
514#endif 547#endif
515 548
… …
519# include "ev_kqueue.c" 552# include "ev_kqueue.c"
520#endif 553#endif
521#if EV_USE_EPOLL 554#if EV_USE_EPOLL
522# include "ev_epoll.c" 555# include "ev_epoll.c"
523#endif 556#endif
524#if EV_USE_POLL 557#if EV_USEV_POLL
525# include "ev_poll.c" 558# include "ev_poll.c"
526#endif 559#endif
527#if EV_USE_SELECT 560#if EV_USE_SELECT
528# include "ev_select.c" 561# include "ev_select.c"
529#endif 562#endif
… …
538ev_version_minor (void) 571ev_version_minor (void)
539{ 572{
540 return EV_VERSION_MINOR; 573 return EV_VERSION_MINOR;
541} 574}
542 575
543/* return true if we are running with elevated privileges and ignore env variables */ 576/* return true if we are running with elevated privileges and should ignore env variables */
544static int 577static int
545enable_secure () 578enable_secure (void)
546{ 579{
580#ifdef WIN32
581 return 0;
582#else
547 return getuid () != geteuid () 583 return getuid () != geteuid ()
548 || getgid () != getegid (); 584 || getgid () != getegid ();
585#endif
549} 586}
550 587
588int
589ev_method (EV_P)
590{
591 return method;
592}
593
594int
551int ev_init (int methods) 595ev_init (EV_P_ int methods)
552{ 596{
553 if (!ev_method) 597 if (!method)
554 { 598 {
555#if EV_USE_MONOTONIC 599#if EV_USE_MONOTONIC
556 { 600 {
557 struct timespec ts; 601 struct timespec ts;
558 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 602 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
559 have_monotonic = 1; 603 have_monotonic = 1;
560 } 604 }
561#endif 605#endif
562 606
563 ev_now = ev_time (); 607 rt_now = ev_time ();
564 now = get_clock (); 608 mn_now = get_clock ();
565 now_floor = now; 609 now_floor = mn_now;
566 diff = ev_now - now; 610 diff = rt_now - mn_now;
567 611
568 if (pipe (sigpipe)) 612 if (pipe (sigpipe))
569 return 0; 613 return 0;
570 614
571 if (methods == EVMETHOD_AUTO) 615 if (methods == EVMETHOD_AUTO)
572 if (!enable_secure () && getenv ("LIBEV_METHODS")) 616 if (!enable_secure () && getenv ("LIBmethodS"))
573 methods = atoi (getenv ("LIBEV_METHODS")); 617 methods = atoi (getenv ("LIBmethodS"));
574 else 618 else
575 methods = EVMETHOD_ANY; 619 methods = EVMETHOD_ANY;
576 620
577 ev_method = 0; 621 method = 0;
578#if EV_USE_KQUEUE 622#if EV_USE_KQUEUE
579 if (!ev_method && (methods & EVMETHOD_KQUEUE)) kqueue_init (methods); 623 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
580#endif 624#endif
581#if EV_USE_EPOLL 625#if EV_USE_EPOLL
582 if (!ev_method && (methods & EVMETHOD_EPOLL )) epoll_init (methods); 626 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
583#endif 627#endif
584#if EV_USE_POLL 628#if EV_USEV_POLL
585 if (!ev_method && (methods & EVMETHOD_POLL )) poll_init (methods); 629 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
586#endif 630#endif
587#if EV_USE_SELECT 631#if EV_USE_SELECT
588 if (!ev_method && (methods & EVMETHOD_SELECT)) select_init (methods); 632 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
589#endif 633#endif
590 634
591 if (ev_method) 635 if (method)
592 { 636 {
593 ev_watcher_init (&sigev, sigcb); 637 ev_watcher_init (&sigev, sigcb);
594 ev_set_priority (&sigev, EV_MAXPRI); 638 ev_set_priority (&sigev, EV_MAXPRI);
595 siginit (); 639 siginit (EV_A);
596 640
597#ifndef WIN32 641#ifndef WIN32
598 ev_signal_init (&childev, childcb, SIGCHLD); 642 ev_signal_init (&childev, childcb, SIGCHLD);
599 ev_set_priority (&childev, EV_MAXPRI); 643 ev_set_priority (&childev, EV_MAXPRI);
600 ev_signal_start (&childev); 644 ev_signal_start (EV_A_ &childev);
645 ev_unref (EV_A); /* child watcher should not keep loop alive */
601#endif 646#endif
602 } 647 }
603 } 648 }
604 649
605 return ev_method; 650 return method;
606} 651}
607 652
608/*****************************************************************************/ 653/*****************************************************************************/
609 654
610void 655void
… …
621 666
622void 667void
623ev_fork_child (void) 668ev_fork_child (void)
624{ 669{
625#if EV_USE_EPOLL 670#if EV_USE_EPOLL
626 if (ev_method == EVMETHOD_EPOLL) 671 if (method == EVMETHOD_EPOLL)
627 epoll_postfork_child (); 672 epoll_postfork_child ();
628#endif 673#endif
629 674
630 ev_io_stop (&sigev); 675 ev_io_stop (&sigev);
631 close (sigpipe [0]); 676 close (sigpipe [0]);
… …
635} 680}
636 681
637/*****************************************************************************/ 682/*****************************************************************************/
638 683
639static void 684static void
640call_pending (void) 685call_pending (EV_P)
641{ 686{
642 int pri; 687 int pri;
643 688
644 for (pri = NUMPRI; pri--; ) 689 for (pri = NUMPRI; pri--; )
645 while (pendingcnt [pri]) 690 while (pendingcnt [pri])
… …
647 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 692 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
648 693
649 if (p->w) 694 if (p->w)
650 { 695 {
651 p->w->pending = 0; 696 p->w->pending = 0;
652 p->w->cb (p->w, p->events); 697 p->w->cb (EV_A_ p->w, p->events);
653 } 698 }
654 } 699 }
655} 700}
656 701
657static void 702static void
658timers_reify (void) 703timers_reify (EV_P)
659{ 704{
660 while (timercnt && timers [0]->at <= now) 705 while (timercnt && timers [0]->at <= mn_now)
661 { 706 {
662 struct ev_timer *w = timers [0]; 707 struct ev_timer *w = timers [0];
663 708
664 /* first reschedule or stop timer */ 709 /* first reschedule or stop timer */
665 if (w->repeat) 710 if (w->repeat)
666 { 711 {
667 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.));
668 w->at = now + w->repeat; 713 w->at = mn_now + w->repeat;
669 downheap ((WT *)timers, timercnt, 0); 714 downheap ((WT *)timers, timercnt, 0);
670 } 715 }
671 else 716 else
672 ev_timer_stop (w); /* nonrepeating: stop timer */ 717 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
673 718
674 event ((W)w, EV_TIMEOUT); 719 event ((W)w, EV_TIMEOUT);
675 } 720 }
676} 721}
677 722
678static void 723static void
679periodics_reify (void) 724periodics_reify (EV_P)
680{ 725{
681 while (periodiccnt && periodics [0]->at <= ev_now) 726 while (periodiccnt && periodics [0]->at <= rt_now)
682 { 727 {
683 struct ev_periodic *w = periodics [0]; 728 struct ev_periodic *w = periodics [0];
684 729
685 /* first reschedule or stop timer */ 730 /* first reschedule or stop timer */
686 if (w->interval) 731 if (w->interval)
687 { 732 {
688 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;
689 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));
690 downheap ((WT *)periodics, periodiccnt, 0); 735 downheap ((WT *)periodics, periodiccnt, 0);
691 } 736 }
692 else 737 else
693 ev_periodic_stop (w); /* nonrepeating: stop timer */ 738 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
694 739
695 event ((W)w, EV_PERIODIC); 740 event (EV_A_ (W)w, EV_PERIODIC);
696 } 741 }
697} 742}
698 743
699static void 744static void
700periodics_reschedule (ev_tstamp diff) 745periodics_reschedule (EV_P_ ev_tstamp diff)
701{ 746{
702 int i; 747 int i;
703 748
704 /* adjust periodics after time jump */ 749 /* adjust periodics after time jump */
705 for (i = 0; i < periodiccnt; ++i) 750 for (i = 0; i < periodiccnt; ++i)
706 { 751 {
707 struct ev_periodic *w = periodics [i]; 752 struct ev_periodic *w = periodics [i];
708 753
709 if (w->interval) 754 if (w->interval)
710 { 755 {
711 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;
712 757
713 if (fabs (diff) >= 1e-4) 758 if (fabs (diff) >= 1e-4)
714 { 759 {
715 ev_periodic_stop (w); 760 ev_periodic_stop (EV_A_ w);
716 ev_periodic_start (w); 761 ev_periodic_start (EV_A_ w);
717 762
718 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 763 i = 0; /* restart loop, inefficient, but time jumps should be rare */
719 } 764 }
720 } 765 }
721 } 766 }
722} 767}
723 768
724static int 769inline int
725time_update_monotonic (void) 770time_update_monotonic (EV_P)
726{ 771{
727 now = get_clock (); 772 mn_now = get_clock ();
728 773
729 if (expect_true (now - now_floor < MIN_TIMEJUMP * .5)) 774 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
730 { 775 {
731 ev_now = now + diff; 776 rt_now = mn_now + diff;
732 return 0; 777 return 0;
733 } 778 }
734 else 779 else
735 { 780 {
736 now_floor = now; 781 now_floor = mn_now;
737 ev_now = ev_time (); 782 rt_now = ev_time ();
738 return 1; 783 return 1;
739 } 784 }
740} 785}
741 786
742static void 787static void
743time_update (void) 788time_update (EV_P)
744{ 789{
745 int i; 790 int i;
746 791
747#if EV_USE_MONOTONIC 792#if EV_USE_MONOTONIC
748 if (expect_true (have_monotonic)) 793 if (expect_true (have_monotonic))
749 { 794 {
750 if (time_update_monotonic ()) 795 if (time_update_monotonic (EV_A))
751 { 796 {
752 ev_tstamp odiff = diff; 797 ev_tstamp odiff = diff;
753 798
754 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 */
755 { 800 {
756 diff = ev_now - now; 801 diff = rt_now - mn_now;
757 802
758 if (fabs (odiff - diff) < MIN_TIMEJUMP) 803 if (fabs (odiff - diff) < MIN_TIMEJUMP)
759 return; /* all is well */ 804 return; /* all is well */
760 805
761 ev_now = ev_time (); 806 rt_now = ev_time ();
762 now = get_clock (); 807 mn_now = get_clock ();
763 now_floor = now; 808 now_floor = mn_now;
764 } 809 }
765 810
766 periodics_reschedule (diff - odiff); 811 periodics_reschedule (EV_A_ diff - odiff);
767 /* no timer adjustment, as the monotonic clock doesn't jump */ 812 /* no timer adjustment, as the monotonic clock doesn't jump */
768 } 813 }
769 } 814 }
770 else 815 else
771#endif 816#endif
772 { 817 {
773 ev_now = ev_time (); 818 rt_now = ev_time ();
774 819
775 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))
776 { 821 {
777 periodics_reschedule (ev_now - now); 822 periodics_reschedule (EV_A_ rt_now - mn_now);
778 823
779 /* 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 */
780 for (i = 0; i < timercnt; ++i) 825 for (i = 0; i < timercnt; ++i)
781 timers [i]->at += diff; 826 timers [i]->at += diff;
782 } 827 }
783 828
784 now = ev_now; 829 mn_now = rt_now;
785 } 830 }
786} 831}
787 832
788int ev_loop_done; 833void
834ev_ref (EV_P)
835{
836 ++activecnt;
837}
789 838
839void
840ev_unref (EV_P)
841{
842 --activecnt;
843}
844
845static int loop_done;
846
847void
790void ev_loop (int flags) 848ev_loop (EV_P_ int flags)
791{ 849{
792 double block; 850 double block;
793 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 851 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
794 852
795 do 853 do
796 { 854 {
797 /* queue check watchers (and execute them) */ 855 /* queue check watchers (and execute them) */
798 if (expect_false (preparecnt)) 856 if (expect_false (preparecnt))
799 { 857 {
800 queue_events ((W *)prepares, preparecnt, EV_PREPARE); 858 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
801 call_pending (); 859 call_pending (EV_A);
802 } 860 }
803 861
804 /* update fd-related kernel structures */ 862 /* update fd-related kernel structures */
805 fd_reify (); 863 fd_reify (EV_A);
806 864
807 /* calculate blocking time */ 865 /* calculate blocking time */
808 866
809 /* 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
810 always have timers, we just calculate it always */ 868 always have timers, we just calculate it always */
811#if EV_USE_MONOTONIC 869#if EV_USE_MONOTONIC
812 if (expect_true (have_monotonic)) 870 if (expect_true (have_monotonic))
813 time_update_monotonic (); 871 time_update_monotonic (EV_A);
814 else 872 else
815#endif 873#endif
816 { 874 {
817 ev_now = ev_time (); 875 rt_now = ev_time ();
818 now = ev_now; 876 mn_now = rt_now;
819 } 877 }
820 878
821 if (flags & EVLOOP_NONBLOCK || idlecnt) 879 if (flags & EVLOOP_NONBLOCK || idlecnt)
822 block = 0.; 880 block = 0.;
823 else 881 else
824 { 882 {
825 block = MAX_BLOCKTIME; 883 block = MAX_BLOCKTIME;
826 884
827 if (timercnt) 885 if (timercnt)
828 { 886 {
829 ev_tstamp to = timers [0]->at - now + method_fudge; 887 ev_tstamp to = timers [0]->at - mn_now + method_fudge;
830 if (block > to) block = to; 888 if (block > to) block = to;
831 } 889 }
832 890
833 if (periodiccnt) 891 if (periodiccnt)
834 { 892 {
835 ev_tstamp to = periodics [0]->at - ev_now + method_fudge; 893 ev_tstamp to = periodics [0]->at - rt_now + method_fudge;
836 if (block > to) block = to; 894 if (block > to) block = to;
837 } 895 }
838 896
839 if (block < 0.) block = 0.; 897 if (block < 0.) block = 0.;
840 } 898 }
841 899
842 method_poll (block); 900 method_poll (EV_A_ block);
843 901
844 /* update ev_now, do magic */ 902 /* update rt_now, do magic */
845 time_update (); 903 time_update (EV_A);
846 904
847 /* queue pending timers and reschedule them */ 905 /* queue pending timers and reschedule them */
848 timers_reify (); /* relative timers called last */ 906 timers_reify (EV_A); /* relative timers called last */
849 periodics_reify (); /* absolute timers called first */ 907 periodics_reify (EV_A); /* absolute timers called first */
850 908
851 /* queue idle watchers unless io or timers are pending */ 909 /* queue idle watchers unless io or timers are pending */
852 if (!pendingcnt) 910 if (!pendingcnt)
853 queue_events ((W *)idles, idlecnt, EV_IDLE); 911 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
854 912
855 /* queue check watchers, to be executed first */ 913 /* queue check watchers, to be executed first */
856 if (checkcnt) 914 if (checkcnt)
857 queue_events ((W *)checks, checkcnt, EV_CHECK); 915 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
858 916
859 call_pending (); 917 call_pending (EV_A);
860 } 918 }
861 while (!ev_loop_done); 919 while (activecnt && !loop_done);
862 920
863 if (ev_loop_done != 2) 921 if (loop_done != 2)
864 ev_loop_done = 0; 922 loop_done = 0;
923}
924
925void
926ev_unloop (EV_P_ int how)
927{
928 loop_done = how;
865} 929}
866 930
867/*****************************************************************************/ 931/*****************************************************************************/
868 932
869static void 933inline void
870wlist_add (WL *head, WL elem) 934wlist_add (WL *head, WL elem)
871{ 935{
872 elem->next = *head; 936 elem->next = *head;
873 *head = elem; 937 *head = elem;
874} 938}
875 939
876static void 940inline void
877wlist_del (WL *head, WL elem) 941wlist_del (WL *head, WL elem)
878{ 942{
879 while (*head) 943 while (*head)
880 { 944 {
881 if (*head == elem) 945 if (*head == elem)
… …
886 950
887 head = &(*head)->next; 951 head = &(*head)->next;
888 } 952 }
889} 953}
890 954
891static void 955inline void
892ev_clear_pending (W w) 956ev_clear_pending (EV_P_ W w)
893{ 957{
894 if (w->pending) 958 if (w->pending)
895 { 959 {
896 pendings [ABSPRI (w)][w->pending - 1].w = 0; 960 pendings [ABSPRI (w)][w->pending - 1].w = 0;
897 w->pending = 0; 961 w->pending = 0;
898 } 962 }
899} 963}
900 964
901static void 965inline void
902ev_start (W w, int active) 966ev_start (EV_P_ W w, int active)
903{ 967{
904 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 968 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
905 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI; 969 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
906 970
907 w->active = active; 971 w->active = active;
972 ev_ref (EV_A);
908} 973}
909 974
910static void 975inline void
911ev_stop (W w) 976ev_stop (EV_P_ W w)
912{ 977{
978 ev_unref (EV_A);
913 w->active = 0; 979 w->active = 0;
914} 980}
915 981
916/*****************************************************************************/ 982/*****************************************************************************/
917 983
918void 984void
919ev_io_start (struct ev_io *w) 985ev_io_start (EV_P_ struct ev_io *w)
920{ 986{
921 int fd = w->fd; 987 int fd = w->fd;
922 988
923 if (ev_is_active (w)) 989 if (ev_is_active (w))
924 return; 990 return;
925 991
926 assert (("ev_io_start called with negative fd", fd >= 0)); 992 assert (("ev_io_start called with negative fd", fd >= 0));
927 993
928 ev_start ((W)w, 1); 994 ev_start (EV_A_ (W)w, 1);
929 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 995 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
930 wlist_add ((WL *)&anfds[fd].head, (WL)w); 996 wlist_add ((WL *)&anfds[fd].head, (WL)w);
931 997
932 fd_change (fd); 998 fd_change (EV_A_ fd);
933} 999}
934 1000
935void 1001void
936ev_io_stop (struct ev_io *w) 1002ev_io_stop (EV_P_ struct ev_io *w)
937{ 1003{
938 ev_clear_pending ((W)w); 1004 ev_clear_pending (EV_A_ (W)w);
939 if (!ev_is_active (w)) 1005 if (!ev_is_active (w))
940 return; 1006 return;
941 1007
942 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1008 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
943 ev_stop ((W)w); 1009 ev_stop (EV_A_ (W)w);
944 1010
945 fd_change (w->fd); 1011 fd_change (EV_A_ w->fd);
946} 1012}
947 1013
948void 1014void
949ev_timer_start (struct ev_timer *w) 1015ev_timer_start (EV_P_ struct ev_timer *w)
950{ 1016{
951 if (ev_is_active (w)) 1017 if (ev_is_active (w))
952 return; 1018 return;
953 1019
954 w->at += now; 1020 w->at += mn_now;
955 1021
956 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.));
957 1023
958 ev_start ((W)w, ++timercnt); 1024 ev_start (EV_A_ (W)w, ++timercnt);
959 array_needsize (timers, timermax, timercnt, ); 1025 array_needsize (timers, timermax, timercnt, );
960 timers [timercnt - 1] = w; 1026 timers [timercnt - 1] = w;
961 upheap ((WT *)timers, timercnt - 1); 1027 upheap ((WT *)timers, timercnt - 1);
962} 1028}
963 1029
964void 1030void
965ev_timer_stop (struct ev_timer *w) 1031ev_timer_stop (EV_P_ struct ev_timer *w)
966{ 1032{
967 ev_clear_pending ((W)w); 1033 ev_clear_pending (EV_A_ (W)w);
968 if (!ev_is_active (w)) 1034 if (!ev_is_active (w))
969 return; 1035 return;
970 1036
971 if (w->active < timercnt--) 1037 if (w->active < timercnt--)
972 { 1038 {
… …
974 downheap ((WT *)timers, timercnt, w->active - 1); 1040 downheap ((WT *)timers, timercnt, w->active - 1);
975 } 1041 }
976 1042
977 w->at = w->repeat; 1043 w->at = w->repeat;
978 1044
979 ev_stop ((W)w); 1045 ev_stop (EV_A_ (W)w);
980} 1046}
981 1047
982void 1048void
983ev_timer_again (struct ev_timer *w) 1049ev_timer_again (EV_P_ struct ev_timer *w)
984{ 1050{
985 if (ev_is_active (w)) 1051 if (ev_is_active (w))
986 { 1052 {
987 if (w->repeat) 1053 if (w->repeat)
988 { 1054 {
989 w->at = now + w->repeat; 1055 w->at = mn_now + w->repeat;
990 downheap ((WT *)timers, timercnt, w->active - 1); 1056 downheap ((WT *)timers, timercnt, w->active - 1);
991 } 1057 }
992 else 1058 else
993 ev_timer_stop (w); 1059 ev_timer_stop (EV_A_ w);
994 } 1060 }
995 else if (w->repeat) 1061 else if (w->repeat)
996 ev_timer_start (w); 1062 ev_timer_start (EV_A_ w);
997} 1063}
998 1064
999void 1065void
1000ev_periodic_start (struct ev_periodic *w) 1066ev_periodic_start (EV_P_ struct ev_periodic *w)
1001{ 1067{
1002 if (ev_is_active (w)) 1068 if (ev_is_active (w))
1003 return; 1069 return;
1004 1070
1005 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.));
1006 1072
1007 /* 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 */
1008 if (w->interval) 1074 if (w->interval)
1009 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval; 1075 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval;
1010 1076
1011 ev_start ((W)w, ++periodiccnt); 1077 ev_start (EV_A_ (W)w, ++periodiccnt);
1012 array_needsize (periodics, periodicmax, periodiccnt, ); 1078 array_needsize (periodics, periodicmax, periodiccnt, );
1013 periodics [periodiccnt - 1] = w; 1079 periodics [periodiccnt - 1] = w;
1014 upheap ((WT *)periodics, periodiccnt - 1); 1080 upheap ((WT *)periodics, periodiccnt - 1);
1015} 1081}
1016 1082
1017void 1083void
1018ev_periodic_stop (struct ev_periodic *w) 1084ev_periodic_stop (EV_P_ struct ev_periodic *w)
1019{ 1085{
1020 ev_clear_pending ((W)w); 1086 ev_clear_pending (EV_A_ (W)w);
1021 if (!ev_is_active (w)) 1087 if (!ev_is_active (w))
1022 return; 1088 return;
1023 1089
1024 if (w->active < periodiccnt--) 1090 if (w->active < periodiccnt--)
1025 { 1091 {
1026 periodics [w->active - 1] = periodics [periodiccnt]; 1092 periodics [w->active - 1] = periodics [periodiccnt];
1027 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1093 downheap ((WT *)periodics, periodiccnt, w->active - 1);
1028 } 1094 }
1029 1095
1030 ev_stop ((W)w); 1096 ev_stop (EV_A_ (W)w);
1031} 1097}
1032 1098
1033#ifndef SA_RESTART 1099#ifndef SA_RESTART
1034# define SA_RESTART 0 1100# define SA_RESTART 0
1035#endif 1101#endif
1036 1102
1037void 1103void
1038ev_signal_start (struct ev_signal *w) 1104ev_signal_start (EV_P_ struct ev_signal *w)
1039{ 1105{
1040 if (ev_is_active (w)) 1106 if (ev_is_active (w))
1041 return; 1107 return;
1042 1108
1043 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));
1044 1110
1045 ev_start ((W)w, 1); 1111 ev_start (EV_A_ (W)w, 1);
1046 array_needsize (signals, signalmax, w->signum, signals_init); 1112 array_needsize (signals, signalmax, w->signum, signals_init);
1047 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1113 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1048 1114
1049 if (!w->next) 1115 if (!w->next)
1050 { 1116 {
… …
1055 sigaction (w->signum, &sa, 0); 1121 sigaction (w->signum, &sa, 0);
1056 } 1122 }
1057} 1123}
1058 1124
1059void 1125void
1060ev_signal_stop (struct ev_signal *w) 1126ev_signal_stop (EV_P_ struct ev_signal *w)
1061{ 1127{
1062 ev_clear_pending ((W)w); 1128 ev_clear_pending (EV_A_ (W)w);
1063 if (!ev_is_active (w)) 1129 if (!ev_is_active (w))
1064 return; 1130 return;
1065 1131
1066 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1132 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1067 ev_stop ((W)w); 1133 ev_stop (EV_A_ (W)w);
1068 1134
1069 if (!signals [w->signum - 1].head) 1135 if (!signals [w->signum - 1].head)
1070 signal (w->signum, SIG_DFL); 1136 signal (w->signum, SIG_DFL);
1071} 1137}
1072 1138
1073void 1139void
1074ev_idle_start (struct ev_idle *w) 1140ev_idle_start (EV_P_ struct ev_idle *w)
1075{ 1141{
1076 if (ev_is_active (w)) 1142 if (ev_is_active (w))
1077 return; 1143 return;
1078 1144
1079 ev_start ((W)w, ++idlecnt); 1145 ev_start (EV_A_ (W)w, ++idlecnt);
1080 array_needsize (idles, idlemax, idlecnt, ); 1146 array_needsize (idles, idlemax, idlecnt, );
1081 idles [idlecnt - 1] = w; 1147 idles [idlecnt - 1] = w;
1082} 1148}
1083 1149
1084void 1150void
1085ev_idle_stop (struct ev_idle *w) 1151ev_idle_stop (EV_P_ struct ev_idle *w)
1086{ 1152{
1087 ev_clear_pending ((W)w); 1153 ev_clear_pending (EV_A_ (W)w);
1088 if (ev_is_active (w)) 1154 if (ev_is_active (w))
1089 return; 1155 return;
1090 1156
1091 idles [w->active - 1] = idles [--idlecnt]; 1157 idles [w->active - 1] = idles [--idlecnt];
1092 ev_stop ((W)w); 1158 ev_stop (EV_A_ (W)w);
1093} 1159}
1094 1160
1095void 1161void
1096ev_prepare_start (struct ev_prepare *w) 1162ev_prepare_start (EV_P_ struct ev_prepare *w)
1097{ 1163{
1098 if (ev_is_active (w)) 1164 if (ev_is_active (w))
1099 return; 1165 return;
1100 1166
1101 ev_start ((W)w, ++preparecnt); 1167 ev_start (EV_A_ (W)w, ++preparecnt);
1102 array_needsize (prepares, preparemax, preparecnt, ); 1168 array_needsize (prepares, preparemax, preparecnt, );
1103 prepares [preparecnt - 1] = w; 1169 prepares [preparecnt - 1] = w;
1104} 1170}
1105 1171
1106void 1172void
1107ev_prepare_stop (struct ev_prepare *w) 1173ev_prepare_stop (EV_P_ struct ev_prepare *w)
1108{ 1174{
1109 ev_clear_pending ((W)w); 1175 ev_clear_pending (EV_A_ (W)w);
1110 if (ev_is_active (w)) 1176 if (ev_is_active (w))
1111 return; 1177 return;
1112 1178
1113 prepares [w->active - 1] = prepares [--preparecnt]; 1179 prepares [w->active - 1] = prepares [--preparecnt];
1114 ev_stop ((W)w); 1180 ev_stop (EV_A_ (W)w);
1115} 1181}
1116 1182
1117void 1183void
1118ev_check_start (struct ev_check *w) 1184ev_check_start (EV_P_ struct ev_check *w)
1119{ 1185{
1120 if (ev_is_active (w)) 1186 if (ev_is_active (w))
1121 return; 1187 return;
1122 1188
1123 ev_start ((W)w, ++checkcnt); 1189 ev_start (EV_A_ (W)w, ++checkcnt);
1124 array_needsize (checks, checkmax, checkcnt, ); 1190 array_needsize (checks, checkmax, checkcnt, );
1125 checks [checkcnt - 1] = w; 1191 checks [checkcnt - 1] = w;
1126} 1192}
1127 1193
1128void 1194void
1129ev_check_stop (struct ev_check *w) 1195ev_check_stop (EV_P_ struct ev_check *w)
1130{ 1196{
1131 ev_clear_pending ((W)w); 1197 ev_clear_pending (EV_A_ (W)w);
1132 if (ev_is_active (w)) 1198 if (ev_is_active (w))
1133 return; 1199 return;
1134 1200
1135 checks [w->active - 1] = checks [--checkcnt]; 1201 checks [w->active - 1] = checks [--checkcnt];
1136 ev_stop ((W)w); 1202 ev_stop (EV_A_ (W)w);
1137} 1203}
1138 1204
1139void 1205void
1140ev_child_start (struct ev_child *w) 1206ev_child_start (EV_P_ struct ev_child *w)
1141{ 1207{
1142 if (ev_is_active (w)) 1208 if (ev_is_active (w))
1143 return; 1209 return;
1144 1210
1145 ev_start ((W)w, 1); 1211 ev_start (EV_A_ (W)w, 1);
1146 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1212 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1147} 1213}
1148 1214
1149void 1215void
1150ev_child_stop (struct ev_child *w) 1216ev_child_stop (EV_P_ struct ev_child *w)
1151{ 1217{
1152 ev_clear_pending ((W)w); 1218 ev_clear_pending (EV_A_ (W)w);
1153 if (ev_is_active (w)) 1219 if (ev_is_active (w))
1154 return; 1220 return;
1155 1221
1156 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1222 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1157 ev_stop ((W)w); 1223 ev_stop (EV_A_ (W)w);
1158} 1224}
1159 1225
1160/*****************************************************************************/ 1226/*****************************************************************************/
1161 1227
1162struct ev_once 1228struct ev_once
… …
1166 void (*cb)(int revents, void *arg); 1232 void (*cb)(int revents, void *arg);
1167 void *arg; 1233 void *arg;
1168}; 1234};
1169 1235
1170static void 1236static void
1171once_cb (struct ev_once *once, int revents) 1237once_cb (EV_P_ struct ev_once *once, int revents)
1172{ 1238{
1173 void (*cb)(int revents, void *arg) = once->cb; 1239 void (*cb)(int revents, void *arg) = once->cb;
1174 void *arg = once->arg; 1240 void *arg = once->arg;
1175 1241
1176 ev_io_stop (&once->io); 1242 ev_io_stop (EV_A_ &once->io);
1177 ev_timer_stop (&once->to); 1243 ev_timer_stop (EV_A_ &once->to);
1178 free (once); 1244 free (once);
1179 1245
1180 cb (revents, arg); 1246 cb (revents, arg);
1181} 1247}
1182 1248
1183static void 1249static void
1184once_cb_io (struct ev_io *w, int revents) 1250once_cb_io (EV_P_ struct ev_io *w, int revents)
1185{ 1251{
1186 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);
1187} 1253}
1188 1254
1189static void 1255static void
1190once_cb_to (struct ev_timer *w, int revents) 1256once_cb_to (EV_P_ struct ev_timer *w, int revents)
1191{ 1257{
1192 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);
1193} 1259}
1194 1260
1195void 1261void
1196ev_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)
1197{ 1263{
1198 struct ev_once *once = malloc (sizeof (struct ev_once)); 1264 struct ev_once *once = malloc (sizeof (struct ev_once));
1199 1265
1200 if (!once) 1266 if (!once)
1201 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1267 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
… …
1206 1272
1207 ev_watcher_init (&once->io, once_cb_io); 1273 ev_watcher_init (&once->io, once_cb_io);
1208 if (fd >= 0) 1274 if (fd >= 0)
1209 { 1275 {
1210 ev_io_set (&once->io, fd, events); 1276 ev_io_set (&once->io, fd, events);
1211 ev_io_start (&once->io); 1277 ev_io_start (EV_A_ &once->io);
1212 } 1278 }
1213 1279
1214 ev_watcher_init (&once->to, once_cb_to); 1280 ev_watcher_init (&once->to, once_cb_to);
1215 if (timeout >= 0.) 1281 if (timeout >= 0.)
1216 { 1282 {
1217 ev_timer_set (&once->to, timeout, 0.); 1283 ev_timer_set (&once->to, timeout, 0.);
1218 ev_timer_start (&once->to); 1284 ev_timer_start (EV_A_ &once->to);
1219 } 1285 }
1220 } 1286 }
1221} 1287}
1222 1288
1223/*****************************************************************************/ 1289/*****************************************************************************/

Diff Legend

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