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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines