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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines