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

Comparing libev/ev.c (file contents):
Revision 1.35 by root, Thu Nov 1 11:55:54 2007 UTC vs.
Revision 1.52 by root, Sat Nov 3 22:10:39 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines