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

Comparing libev/ev.c (file contents):
Revision 1.22 by root, Wed Oct 31 19:07:43 2007 UTC vs.
Revision 1.53 by root, Sat Nov 3 22:31:11 2007 UTC

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

Diff Legend

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