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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines