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

Comparing libev/ev.c (file contents):
Revision 1.14 by root, Wed Oct 31 11:52:12 2007 UTC vs.
Revision 1.55 by root, Sun Nov 4 00:39:24 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines