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

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