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

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

Diff Legend

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