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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines