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

Comparing libev/ev.c (file contents):
Revision 1.21 by root, Wed Oct 31 18:37:38 2007 UTC vs.
Revision 1.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_prepare **prepares; 466#ifndef WCONTINUED
330static int preparemax, preparecnt; 467# define WCONTINUED 0
468#endif
331 469
332static struct ev_check **checks; 470static void
333static int checkmax, checkcnt; 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
334 501
335/*****************************************************************************/ 502/*****************************************************************************/
336 503
504#if EV_USE_KQUEUE
505# include "ev_kqueue.c"
506#endif
337#if HAVE_EPOLL 507#if EV_USE_EPOLL
338# include "ev_epoll.c" 508# include "ev_epoll.c"
339#endif 509#endif
510#if EV_USEV_POLL
511# include "ev_poll.c"
512#endif
340#if HAVE_SELECT 513#if EV_USE_SELECT
341# include "ev_select.c" 514# include "ev_select.c"
342#endif 515#endif
343 516
344int ev_init (int flags) 517int
518ev_version_major (void)
345{ 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 {
346#if HAVE_MONOTONIC 552#if EV_USE_MONOTONIC
347 { 553 {
348 struct timespec ts; 554 struct timespec ts;
349 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 555 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
350 have_monotonic = 1; 556 have_monotonic = 1;
351 } 557 }
352#endif 558#endif
353 559
354 ev_now = ev_time (); 560 rt_now = ev_time ();
355 now = get_clock (); 561 mn_now = get_clock ();
356 diff = ev_now - now; 562 now_floor = mn_now;
563 rtmn_diff = rt_now - mn_now;
357 564
358 if (pipe (sigpipe)) 565 if (pipe (sigpipe))
359 return 0; 566 return 0;
360 567
361 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
362#if HAVE_EPOLL 578#if EV_USE_EPOLL
363 if (ev_method == EVMETHOD_NONE) epoll_init (flags); 579 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
364#endif 580#endif
581#if EV_USEV_POLL
582 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
583#endif
365#if HAVE_SELECT 584#if EV_USE_SELECT
366 if (ev_method == EVMETHOD_NONE) select_init (flags); 585 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
367#endif 586#endif
368 587
369 if (ev_method) 588 if (method)
370 { 589 {
371 evw_init (&sigev, sigcb); 590 ev_watcher_init (&sigev, sigcb);
591 ev_set_priority (&sigev, EV_MAXPRI);
372 siginit (); 592 siginit (EV_A);
373 }
374 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
375 return ev_method; 603 return method;
376} 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
377 634
378/*****************************************************************************/ 635/*****************************************************************************/
379 636
380void ev_prefork (void) 637void
638ev_fork_prepare (void)
381{ 639{
382 /* nop */ 640 /* nop */
383} 641}
384 642
643void
385void ev_postfork_parent (void) 644ev_fork_parent (void)
386{ 645{
387 /* nop */ 646 /* nop */
388} 647}
389 648
649void
390void ev_postfork_child (void) 650ev_fork_child (void)
391{ 651{
652 /*TODO*/
653#if !EV_MULTIPLICITY
392#if HAVE_EPOLL 654#if EV_USE_EPOLL
393 if (ev_method == EVMETHOD_EPOLL) 655 if (method == EVMETHOD_EPOLL)
394 epoll_postfork_child (); 656 epoll_postfork_child (EV_A);
395#endif 657#endif
396 658
397 evio_stop (&sigev); 659 ev_io_stop (EV_A_ &sigev);
398 close (sigpipe [0]); 660 close (sigpipe [0]);
399 close (sigpipe [1]); 661 close (sigpipe [1]);
400 pipe (sigpipe); 662 pipe (sigpipe);
401 siginit (); 663 siginit (EV_A);
664#endif
402} 665}
403 666
404/*****************************************************************************/ 667/*****************************************************************************/
405 668
406static void 669static void
407fd_reify (void) 670call_pending (EV_P)
408{ 671{
409 int i; 672 int pri;
410 673
411 for (i = 0; i < fdchangecnt; ++i) 674 for (pri = NUMPRI; pri--; )
412 { 675 while (pendingcnt [pri])
413 int fd = fdchanges [i];
414 ANFD *anfd = anfds + fd;
415 struct ev_io *w;
416
417 int wev = 0;
418
419 for (w = anfd->head; w; w = w->next)
420 wev |= w->events;
421
422 if (anfd->wev != wev)
423 { 676 {
424 method_modify (fd, anfd->wev, wev);
425 anfd->wev = wev;
426 }
427 }
428
429 fdchangecnt = 0;
430}
431
432static void
433call_pending ()
434{
435 while (pendingcnt)
436 {
437 ANPENDING *p = pendings + --pendingcnt; 677 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
438 678
439 if (p->w) 679 if (p->w)
440 { 680 {
441 p->w->pending = 0; 681 p->w->pending = 0;
442 p->w->cb (p->w, p->events); 682 p->w->cb (EV_A_ p->w, p->events);
443 } 683 }
444 } 684 }
445} 685}
446 686
447static void 687static void
448timers_reify () 688timers_reify (EV_P)
449{ 689{
450 while (timercnt && timers [0]->at <= now) 690 while (timercnt && timers [0]->at <= mn_now)
451 { 691 {
452 struct ev_timer *w = timers [0]; 692 struct ev_timer *w = timers [0];
453
454 event ((W)w, EV_TIMEOUT);
455 693
456 /* first reschedule or stop timer */ 694 /* first reschedule or stop timer */
457 if (w->repeat) 695 if (w->repeat)
458 { 696 {
697 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
459 w->at = now + w->repeat; 698 w->at = mn_now + w->repeat;
460 assert (("timer timeout in the past, negative repeat?", w->at > now));
461 downheap ((WT *)timers, timercnt, 0); 699 downheap ((WT *)timers, timercnt, 0);
462 } 700 }
463 else 701 else
464 evtimer_stop (w); /* nonrepeating: stop timer */ 702 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
465 }
466}
467 703
704 event (EV_A_ (W)w, EV_TIMEOUT);
705 }
706}
707
468static void 708static void
469periodics_reify () 709periodics_reify (EV_P)
470{ 710{
471 while (periodiccnt && periodics [0]->at <= ev_now) 711 while (periodiccnt && periodics [0]->at <= rt_now)
472 { 712 {
473 struct ev_periodic *w = periodics [0]; 713 struct ev_periodic *w = periodics [0];
474 714
475 /* first reschedule or stop timer */ 715 /* first reschedule or stop timer */
476 if (w->interval) 716 if (w->interval)
477 { 717 {
478 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;
479 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));
480 downheap ((WT *)periodics, periodiccnt, 0); 720 downheap ((WT *)periodics, periodiccnt, 0);
481 } 721 }
482 else 722 else
483 evperiodic_stop (w); /* nonrepeating: stop timer */ 723 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
484 724
485 event ((W)w, EV_TIMEOUT); 725 event (EV_A_ (W)w, EV_PERIODIC);
486 } 726 }
487} 727}
488 728
489static void 729static void
490periodics_reschedule (ev_tstamp diff) 730periodics_reschedule (EV_P)
491{ 731{
492 int i; 732 int i;
493 733
494 /* adjust periodics after time jump */ 734 /* adjust periodics after time jump */
495 for (i = 0; i < periodiccnt; ++i) 735 for (i = 0; i < periodiccnt; ++i)
496 { 736 {
497 struct ev_periodic *w = periodics [i]; 737 struct ev_periodic *w = periodics [i];
498 738
499 if (w->interval) 739 if (w->interval)
500 { 740 {
501 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;
502 742
503 if (fabs (diff) >= 1e-4) 743 if (fabs (diff) >= 1e-4)
504 { 744 {
505 evperiodic_stop (w); 745 ev_periodic_stop (EV_A_ w);
506 evperiodic_start (w); 746 ev_periodic_start (EV_A_ w);
507 747
508 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 748 i = 0; /* restart loop, inefficient, but time jumps should be rare */
509 } 749 }
510 } 750 }
511 } 751 }
512} 752}
513 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
514static void 772static void
515time_update () 773time_update (EV_P)
516{ 774{
517 int i; 775 int i;
518 776
519 ev_now = ev_time (); 777#if EV_USE_MONOTONIC
520
521 if (have_monotonic) 778 if (expect_true (have_monotonic))
522 { 779 {
523 ev_tstamp odiff = diff; 780 if (time_update_monotonic (EV_A))
524
525 for (i = 4; --i; ) /* loop a few times, before making important decisions */
526 { 781 {
527 now = get_clock (); 782 ev_tstamp odiff = rtmn_diff;
783
784 for (i = 4; --i; ) /* loop a few times, before making important decisions */
785 {
528 diff = ev_now - now; 786 rtmn_diff = rt_now - mn_now;
529 787
530 if (fabs (odiff - diff) < MIN_TIMEJUMP) 788 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
531 return; /* all is well */ 789 return; /* all is well */
532 790
533 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) */
534 } 799 }
535
536 periodics_reschedule (diff - odiff);
537 /* no timer adjustment, as the monotonic clock doesn't jump */
538 } 800 }
539 else 801 else
802#endif
540 { 803 {
541 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))
542 { 807 {
543 periodics_reschedule (ev_now - now); 808 periodics_reschedule (EV_A);
544 809
545 /* 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 */
546 for (i = 0; i < timercnt; ++i) 811 for (i = 0; i < timercnt; ++i)
547 timers [i]->at += diff; 812 timers [i]->at += rt_now - mn_now;
548 } 813 }
549 814
550 now = ev_now; 815 mn_now = rt_now;
551 } 816 }
552} 817}
553 818
554int ev_loop_done; 819void
820ev_ref (EV_P)
821{
822 ++activecnt;
823}
555 824
825void
826ev_unref (EV_P)
827{
828 --activecnt;
829}
830
831static int loop_done;
832
833void
556void ev_loop (int flags) 834ev_loop (EV_P_ int flags)
557{ 835{
558 double block; 836 double block;
559 ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0; 837 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
560 838
561 do 839 do
562 { 840 {
563 /* queue check watchers (and execute them) */ 841 /* queue check watchers (and execute them) */
564 if (preparecnt) 842 if (expect_false (preparecnt))
565 { 843 {
566 queue_events ((W *)prepares, preparecnt, EV_PREPARE); 844 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
567 call_pending (); 845 call_pending (EV_A);
568 } 846 }
569 847
570 /* update fd-related kernel structures */ 848 /* update fd-related kernel structures */
571 fd_reify (); 849 fd_reify (EV_A);
572 850
573 /* calculate blocking time */ 851 /* calculate blocking time */
574 852
575 /* we only need this for !monotonic clockor timers, but as we basically 853 /* we only need this for !monotonic clockor timers, but as we basically
576 always have timers, we just calculate it always */ 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 {
577 ev_now = ev_time (); 861 rt_now = ev_time ();
862 mn_now = rt_now;
863 }
578 864
579 if (flags & EVLOOP_NONBLOCK || idlecnt) 865 if (flags & EVLOOP_NONBLOCK || idlecnt)
580 block = 0.; 866 block = 0.;
581 else 867 else
582 { 868 {
583 block = MAX_BLOCKTIME; 869 block = MAX_BLOCKTIME;
584 870
585 if (timercnt) 871 if (timercnt)
586 { 872 {
587 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;
588 if (block > to) block = to; 874 if (block > to) block = to;
589 } 875 }
590 876
591 if (periodiccnt) 877 if (periodiccnt)
592 { 878 {
593 ev_tstamp to = periodics [0]->at - ev_now + method_fudge; 879 ev_tstamp to = periodics [0]->at - rt_now + method_fudge;
594 if (block > to) block = to; 880 if (block > to) block = to;
595 } 881 }
596 882
597 if (block < 0.) block = 0.; 883 if (block < 0.) block = 0.;
598 } 884 }
599 885
600 method_poll (block); 886 method_poll (EV_A_ block);
601 887
602 /* update ev_now, do magic */ 888 /* update rt_now, do magic */
603 time_update (); 889 time_update (EV_A);
604 890
605 /* queue pending timers and reschedule them */ 891 /* queue pending timers and reschedule them */
606 timers_reify (); /* relative timers called last */ 892 timers_reify (EV_A); /* relative timers called last */
607 periodics_reify (); /* absolute timers called first */ 893 periodics_reify (EV_A); /* absolute timers called first */
608 894
609 /* queue idle watchers unless io or timers are pending */ 895 /* queue idle watchers unless io or timers are pending */
610 if (!pendingcnt) 896 if (!pendingcnt)
611 queue_events ((W *)idles, idlecnt, EV_IDLE); 897 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
612 898
613 /* queue check watchers, to be executed first */ 899 /* queue check watchers, to be executed first */
614 if (checkcnt) 900 if (checkcnt)
615 queue_events ((W *)checks, checkcnt, EV_CHECK); 901 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
616 902
617 call_pending (); 903 call_pending (EV_A);
618 } 904 }
619 while (!ev_loop_done); 905 while (activecnt && !loop_done);
620 906
621 if (ev_loop_done != 2) 907 if (loop_done != 2)
622 ev_loop_done = 0; 908 loop_done = 0;
909}
910
911void
912ev_unloop (EV_P_ int how)
913{
914 loop_done = how;
623} 915}
624 916
625/*****************************************************************************/ 917/*****************************************************************************/
626 918
627static void 919inline void
628wlist_add (WL *head, WL elem) 920wlist_add (WL *head, WL elem)
629{ 921{
630 elem->next = *head; 922 elem->next = *head;
631 *head = elem; 923 *head = elem;
632} 924}
633 925
634static void 926inline void
635wlist_del (WL *head, WL elem) 927wlist_del (WL *head, WL elem)
636{ 928{
637 while (*head) 929 while (*head)
638 { 930 {
639 if (*head == elem) 931 if (*head == elem)
644 936
645 head = &(*head)->next; 937 head = &(*head)->next;
646 } 938 }
647} 939}
648 940
649static void 941inline void
650ev_clear (W w) 942ev_clear_pending (EV_P_ W w)
651{ 943{
652 if (w->pending) 944 if (w->pending)
653 { 945 {
654 pendings [w->pending - 1].w = 0; 946 pendings [ABSPRI (w)][w->pending - 1].w = 0;
655 w->pending = 0; 947 w->pending = 0;
656 } 948 }
657} 949}
658 950
659static void 951inline void
660ev_start (W w, int active) 952ev_start (EV_P_ W w, int active)
661{ 953{
954 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
955 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
956
662 w->active = active; 957 w->active = active;
958 ev_ref (EV_A);
663} 959}
664 960
665static void 961inline void
666ev_stop (W w) 962ev_stop (EV_P_ W w)
667{ 963{
964 ev_unref (EV_A);
668 w->active = 0; 965 w->active = 0;
669} 966}
670 967
671/*****************************************************************************/ 968/*****************************************************************************/
672 969
673void 970void
674evio_start (struct ev_io *w) 971ev_io_start (EV_P_ struct ev_io *w)
675{ 972{
973 int fd = w->fd;
974
676 if (ev_is_active (w)) 975 if (ev_is_active (w))
677 return; 976 return;
678 977
679 int fd = w->fd; 978 assert (("ev_io_start called with negative fd", fd >= 0));
680 979
681 ev_start ((W)w, 1); 980 ev_start (EV_A_ (W)w, 1);
682 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 981 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
683 wlist_add ((WL *)&anfds[fd].head, (WL)w); 982 wlist_add ((WL *)&anfds[fd].head, (WL)w);
684 983
685 ++fdchangecnt; 984 fd_change (EV_A_ fd);
686 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
687 fdchanges [fdchangecnt - 1] = fd;
688} 985}
689 986
690void 987void
691evio_stop (struct ev_io *w) 988ev_io_stop (EV_P_ struct ev_io *w)
692{ 989{
693 ev_clear ((W)w); 990 ev_clear_pending (EV_A_ (W)w);
694 if (!ev_is_active (w)) 991 if (!ev_is_active (w))
695 return; 992 return;
696 993
697 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 994 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
698 ev_stop ((W)w); 995 ev_stop (EV_A_ (W)w);
699 996
700 ++fdchangecnt; 997 fd_change (EV_A_ w->fd);
701 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
702 fdchanges [fdchangecnt - 1] = w->fd;
703} 998}
704 999
705void 1000void
706evtimer_start (struct ev_timer *w) 1001ev_timer_start (EV_P_ struct ev_timer *w)
707{ 1002{
708 if (ev_is_active (w)) 1003 if (ev_is_active (w))
709 return; 1004 return;
710 1005
711 w->at += now; 1006 w->at += mn_now;
712 1007
713 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.));
714 1009
715 ev_start ((W)w, ++timercnt); 1010 ev_start (EV_A_ (W)w, ++timercnt);
716 array_needsize (timers, timermax, timercnt, ); 1011 array_needsize (timers, timermax, timercnt, );
717 timers [timercnt - 1] = w; 1012 timers [timercnt - 1] = w;
718 upheap ((WT *)timers, timercnt - 1); 1013 upheap ((WT *)timers, timercnt - 1);
719} 1014}
720 1015
721void 1016void
722evtimer_stop (struct ev_timer *w) 1017ev_timer_stop (EV_P_ struct ev_timer *w)
723{ 1018{
724 ev_clear ((W)w); 1019 ev_clear_pending (EV_A_ (W)w);
725 if (!ev_is_active (w)) 1020 if (!ev_is_active (w))
726 return; 1021 return;
727 1022
728 if (w->active < timercnt--) 1023 if (w->active < timercnt--)
729 { 1024 {
731 downheap ((WT *)timers, timercnt, w->active - 1); 1026 downheap ((WT *)timers, timercnt, w->active - 1);
732 } 1027 }
733 1028
734 w->at = w->repeat; 1029 w->at = w->repeat;
735 1030
736 ev_stop ((W)w); 1031 ev_stop (EV_A_ (W)w);
737} 1032}
738 1033
739void 1034void
740evtimer_again (struct ev_timer *w) 1035ev_timer_again (EV_P_ struct ev_timer *w)
741{ 1036{
742 if (ev_is_active (w)) 1037 if (ev_is_active (w))
743 { 1038 {
744 if (w->repeat) 1039 if (w->repeat)
745 { 1040 {
746 w->at = now + w->repeat; 1041 w->at = mn_now + w->repeat;
747 downheap ((WT *)timers, timercnt, w->active - 1); 1042 downheap ((WT *)timers, timercnt, w->active - 1);
748 } 1043 }
749 else 1044 else
750 evtimer_stop (w); 1045 ev_timer_stop (EV_A_ w);
751 } 1046 }
752 else if (w->repeat) 1047 else if (w->repeat)
753 evtimer_start (w); 1048 ev_timer_start (EV_A_ w);
754} 1049}
755 1050
756void 1051void
757evperiodic_start (struct ev_periodic *w) 1052ev_periodic_start (EV_P_ struct ev_periodic *w)
758{ 1053{
759 if (ev_is_active (w)) 1054 if (ev_is_active (w))
760 return; 1055 return;
761 1056
762 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.));
763 1058
764 /* 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 */
765 if (w->interval) 1060 if (w->interval)
766 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval; 1061 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval;
767 1062
768 ev_start ((W)w, ++periodiccnt); 1063 ev_start (EV_A_ (W)w, ++periodiccnt);
769 array_needsize (periodics, periodicmax, periodiccnt, ); 1064 array_needsize (periodics, periodicmax, periodiccnt, );
770 periodics [periodiccnt - 1] = w; 1065 periodics [periodiccnt - 1] = w;
771 upheap ((WT *)periodics, periodiccnt - 1); 1066 upheap ((WT *)periodics, periodiccnt - 1);
772} 1067}
773 1068
774void 1069void
775evperiodic_stop (struct ev_periodic *w) 1070ev_periodic_stop (EV_P_ struct ev_periodic *w)
776{ 1071{
777 ev_clear ((W)w); 1072 ev_clear_pending (EV_A_ (W)w);
778 if (!ev_is_active (w)) 1073 if (!ev_is_active (w))
779 return; 1074 return;
780 1075
781 if (w->active < periodiccnt--) 1076 if (w->active < periodiccnt--)
782 { 1077 {
783 periodics [w->active - 1] = periodics [periodiccnt]; 1078 periodics [w->active - 1] = periodics [periodiccnt];
784 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1079 downheap ((WT *)periodics, periodiccnt, w->active - 1);
785 } 1080 }
786 1081
787 ev_stop ((W)w); 1082 ev_stop (EV_A_ (W)w);
788} 1083}
789 1084
1085#ifndef SA_RESTART
1086# define SA_RESTART 0
1087#endif
1088
790void 1089void
791evsignal_start (struct ev_signal *w) 1090ev_signal_start (EV_P_ struct ev_signal *w)
792{ 1091{
793 if (ev_is_active (w)) 1092 if (ev_is_active (w))
794 return; 1093 return;
795 1094
1095 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1096
796 ev_start ((W)w, 1); 1097 ev_start (EV_A_ (W)w, 1);
797 array_needsize (signals, signalmax, w->signum, signals_init); 1098 array_needsize (signals, signalmax, w->signum, signals_init);
798 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1099 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
799 1100
800 if (!w->next) 1101 if (!w->next)
801 { 1102 {
802 struct sigaction sa; 1103 struct sigaction sa;
803 sa.sa_handler = sighandler; 1104 sa.sa_handler = sighandler;
804 sigfillset (&sa.sa_mask); 1105 sigfillset (&sa.sa_mask);
805 sa.sa_flags = 0; 1106 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
806 sigaction (w->signum, &sa, 0); 1107 sigaction (w->signum, &sa, 0);
807 } 1108 }
808} 1109}
809 1110
810void 1111void
811evsignal_stop (struct ev_signal *w) 1112ev_signal_stop (EV_P_ struct ev_signal *w)
812{ 1113{
813 ev_clear ((W)w); 1114 ev_clear_pending (EV_A_ (W)w);
814 if (!ev_is_active (w)) 1115 if (!ev_is_active (w))
815 return; 1116 return;
816 1117
817 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1118 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
818 ev_stop ((W)w); 1119 ev_stop (EV_A_ (W)w);
819 1120
820 if (!signals [w->signum - 1].head) 1121 if (!signals [w->signum - 1].head)
821 signal (w->signum, SIG_DFL); 1122 signal (w->signum, SIG_DFL);
822} 1123}
823 1124
1125void
824void evidle_start (struct ev_idle *w) 1126ev_idle_start (EV_P_ struct ev_idle *w)
825{ 1127{
826 if (ev_is_active (w)) 1128 if (ev_is_active (w))
827 return; 1129 return;
828 1130
829 ev_start ((W)w, ++idlecnt); 1131 ev_start (EV_A_ (W)w, ++idlecnt);
830 array_needsize (idles, idlemax, idlecnt, ); 1132 array_needsize (idles, idlemax, idlecnt, );
831 idles [idlecnt - 1] = w; 1133 idles [idlecnt - 1] = w;
832} 1134}
833 1135
1136void
834void evidle_stop (struct ev_idle *w) 1137ev_idle_stop (EV_P_ struct ev_idle *w)
835{ 1138{
836 ev_clear ((W)w); 1139 ev_clear_pending (EV_A_ (W)w);
837 if (ev_is_active (w)) 1140 if (ev_is_active (w))
838 return; 1141 return;
839 1142
840 idles [w->active - 1] = idles [--idlecnt]; 1143 idles [w->active - 1] = idles [--idlecnt];
841 ev_stop ((W)w); 1144 ev_stop (EV_A_ (W)w);
842} 1145}
843 1146
1147void
844void evprepare_start (struct ev_prepare *w) 1148ev_prepare_start (EV_P_ struct ev_prepare *w)
845{ 1149{
846 if (ev_is_active (w)) 1150 if (ev_is_active (w))
847 return; 1151 return;
848 1152
849 ev_start ((W)w, ++preparecnt); 1153 ev_start (EV_A_ (W)w, ++preparecnt);
850 array_needsize (prepares, preparemax, preparecnt, ); 1154 array_needsize (prepares, preparemax, preparecnt, );
851 prepares [preparecnt - 1] = w; 1155 prepares [preparecnt - 1] = w;
852} 1156}
853 1157
1158void
854void evprepare_stop (struct ev_prepare *w) 1159ev_prepare_stop (EV_P_ struct ev_prepare *w)
855{ 1160{
856 ev_clear ((W)w); 1161 ev_clear_pending (EV_A_ (W)w);
857 if (ev_is_active (w)) 1162 if (ev_is_active (w))
858 return; 1163 return;
859 1164
860 prepares [w->active - 1] = prepares [--preparecnt]; 1165 prepares [w->active - 1] = prepares [--preparecnt];
861 ev_stop ((W)w); 1166 ev_stop (EV_A_ (W)w);
862} 1167}
863 1168
1169void
864void evcheck_start (struct ev_check *w) 1170ev_check_start (EV_P_ struct ev_check *w)
865{ 1171{
866 if (ev_is_active (w)) 1172 if (ev_is_active (w))
867 return; 1173 return;
868 1174
869 ev_start ((W)w, ++checkcnt); 1175 ev_start (EV_A_ (W)w, ++checkcnt);
870 array_needsize (checks, checkmax, checkcnt, ); 1176 array_needsize (checks, checkmax, checkcnt, );
871 checks [checkcnt - 1] = w; 1177 checks [checkcnt - 1] = w;
872} 1178}
873 1179
1180void
874void evcheck_stop (struct ev_check *w) 1181ev_check_stop (EV_P_ struct ev_check *w)
875{ 1182{
876 ev_clear ((W)w); 1183 ev_clear_pending (EV_A_ (W)w);
877 if (ev_is_active (w)) 1184 if (ev_is_active (w))
878 return; 1185 return;
879 1186
880 checks [w->active - 1] = checks [--checkcnt]; 1187 checks [w->active - 1] = checks [--checkcnt];
881 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);
882} 1210}
883 1211
884/*****************************************************************************/ 1212/*****************************************************************************/
885 1213
886struct ev_once 1214struct ev_once
890 void (*cb)(int revents, void *arg); 1218 void (*cb)(int revents, void *arg);
891 void *arg; 1219 void *arg;
892}; 1220};
893 1221
894static void 1222static void
895once_cb (struct ev_once *once, int revents) 1223once_cb (EV_P_ struct ev_once *once, int revents)
896{ 1224{
897 void (*cb)(int revents, void *arg) = once->cb; 1225 void (*cb)(int revents, void *arg) = once->cb;
898 void *arg = once->arg; 1226 void *arg = once->arg;
899 1227
900 evio_stop (&once->io); 1228 ev_io_stop (EV_A_ &once->io);
901 evtimer_stop (&once->to); 1229 ev_timer_stop (EV_A_ &once->to);
902 free (once); 1230 free (once);
903 1231
904 cb (revents, arg); 1232 cb (revents, arg);
905} 1233}
906 1234
907static void 1235static void
908once_cb_io (struct ev_io *w, int revents) 1236once_cb_io (EV_P_ struct ev_io *w, int revents)
909{ 1237{
910 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);
911} 1239}
912 1240
913static void 1241static void
914once_cb_to (struct ev_timer *w, int revents) 1242once_cb_to (EV_P_ struct ev_timer *w, int revents)
915{ 1243{
916 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);
917} 1245}
918 1246
919void 1247void
920ev_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)
921{ 1249{
922 struct ev_once *once = malloc (sizeof (struct ev_once)); 1250 struct ev_once *once = malloc (sizeof (struct ev_once));
923 1251
924 if (!once) 1252 if (!once)
925 cb (EV_ERROR, arg); 1253 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
926 else 1254 else
927 { 1255 {
928 once->cb = cb; 1256 once->cb = cb;
929 once->arg = arg; 1257 once->arg = arg;
930 1258
931 evw_init (&once->io, once_cb_io); 1259 ev_watcher_init (&once->io, once_cb_io);
932
933 if (fd >= 0) 1260 if (fd >= 0)
934 { 1261 {
935 evio_set (&once->io, fd, events); 1262 ev_io_set (&once->io, fd, events);
936 evio_start (&once->io); 1263 ev_io_start (EV_A_ &once->io);
937 } 1264 }
938 1265
939 evw_init (&once->to, once_cb_to); 1266 ev_watcher_init (&once->to, once_cb_to);
940
941 if (timeout >= 0.) 1267 if (timeout >= 0.)
942 { 1268 {
943 evtimer_set (&once->to, timeout, 0.); 1269 ev_timer_set (&once->to, timeout, 0.);
944 evtimer_start (&once->to); 1270 ev_timer_start (EV_A_ &once->to);
945 } 1271 }
946 } 1272 }
947} 1273}
948 1274
949/*****************************************************************************/ 1275/*****************************************************************************/
960 1286
961static void 1287static void
962ocb (struct ev_timer *w, int revents) 1288ocb (struct ev_timer *w, int revents)
963{ 1289{
964 //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);
965 evtimer_stop (w); 1291 ev_timer_stop (w);
966 evtimer_start (w); 1292 ev_timer_start (w);
967} 1293}
968 1294
969static void 1295static void
970scb (struct ev_signal *w, int revents) 1296scb (struct ev_signal *w, int revents)
971{ 1297{
972 fprintf (stderr, "signal %x,%d\n", revents, w->signum); 1298 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
973 evio_stop (&wio); 1299 ev_io_stop (&wio);
974 evio_start (&wio); 1300 ev_io_start (&wio);
975} 1301}
976 1302
977static void 1303static void
978gcb (struct ev_signal *w, int revents) 1304gcb (struct ev_signal *w, int revents)
979{ 1305{
983 1309
984int main (void) 1310int main (void)
985{ 1311{
986 ev_init (0); 1312 ev_init (0);
987 1313
988 evio_init (&wio, sin_cb, 0, EV_READ); 1314 ev_io_init (&wio, sin_cb, 0, EV_READ);
989 evio_start (&wio); 1315 ev_io_start (&wio);
990 1316
991 struct ev_timer t[10000]; 1317 struct ev_timer t[10000];
992 1318
993#if 0 1319#if 0
994 int i; 1320 int i;
995 for (i = 0; i < 10000; ++i) 1321 for (i = 0; i < 10000; ++i)
996 { 1322 {
997 struct ev_timer *w = t + i; 1323 struct ev_timer *w = t + i;
998 evw_init (w, ocb, i); 1324 ev_watcher_init (w, ocb, i);
999 evtimer_init_abs (w, ocb, drand48 (), 0.99775533); 1325 ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
1000 evtimer_start (w); 1326 ev_timer_start (w);
1001 if (drand48 () < 0.5) 1327 if (drand48 () < 0.5)
1002 evtimer_stop (w); 1328 ev_timer_stop (w);
1003 } 1329 }
1004#endif 1330#endif
1005 1331
1006 struct ev_timer t1; 1332 struct ev_timer t1;
1007 evtimer_init (&t1, ocb, 5, 10); 1333 ev_timer_init (&t1, ocb, 5, 10);
1008 evtimer_start (&t1); 1334 ev_timer_start (&t1);
1009 1335
1010 struct ev_signal sig; 1336 struct ev_signal sig;
1011 evsignal_init (&sig, scb, SIGQUIT); 1337 ev_signal_init (&sig, scb, SIGQUIT);
1012 evsignal_start (&sig); 1338 ev_signal_start (&sig);
1013 1339
1014 struct ev_check cw; 1340 struct ev_check cw;
1015 evcheck_init (&cw, gcb); 1341 ev_check_init (&cw, gcb);
1016 evcheck_start (&cw); 1342 ev_check_start (&cw);
1017 1343
1018 struct ev_idle iw; 1344 struct ev_idle iw;
1019 evidle_init (&iw, gcb); 1345 ev_idle_init (&iw, gcb);
1020 evidle_start (&iw); 1346 ev_idle_start (&iw);
1021 1347
1022 ev_loop (0); 1348 ev_loop (0);
1023 1349
1024 return 0; 1350 return 0;
1025} 1351}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines