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

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

Diff Legend

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