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

Comparing libev/ev.c (file contents):
Revision 1.50 by root, Sat Nov 3 19:41:55 2007 UTC vs.
Revision 1.55 by root, Sun Nov 4 00:39:24 2007 UTC

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

Diff Legend

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