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

Comparing libev/ev.c (file contents):
Revision 1.12 by root, Wed Oct 31 09:23:17 2007 UTC vs.
Revision 1.53 by root, Sat Nov 3 22:31:11 2007 UTC

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

Diff Legend

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