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

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

Diff Legend

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