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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines