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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines