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

Comparing libev/ev.c (file contents):
Revision 1.16 by root, Wed Oct 31 13:57:34 2007 UTC vs.
Revision 1.52 by root, Sat Nov 3 22:10:39 2007 UTC

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

Diff Legend

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