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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines