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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines