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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines