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

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines