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

Comparing libev/ev.c (file contents):
Revision 1.36 by root, Thu Nov 1 13:11:11 2007 UTC vs.
Revision 1.51 by root, Sat Nov 3 21:58:51 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines