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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines