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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines