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

Comparing libev/ev.c (file contents):
Revision 1.16 by root, Wed Oct 31 13:57:34 2007 UTC vs.
Revision 1.54 by root, Sun Nov 4 00:24:16 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines