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

Comparing libev/ev.c (file contents):
Revision 1.23 by root, Wed Oct 31 20:10:17 2007 UTC vs.
Revision 1.54 by root, Sun Nov 4 00:24:16 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines