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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines