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

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

Diff Legend

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