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

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines