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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines