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

Comparing libev/ev.c (file contents):
Revision 1.64 by root, Sun Nov 4 23:14:11 2007 UTC vs.
Revision 1.133 by root, Fri Nov 23 11:32:22 2007 UTC

26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (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
29 * 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.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H
38# include EV_CONFIG_H
39# else
32# include "config.h" 40# include "config.h"
41# endif
33 42
34# if HAVE_CLOCK_GETTIME 43# if HAVE_CLOCK_GETTIME
44# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 45# define EV_USE_MONOTONIC 1
46# endif
47# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 48# define EV_USE_REALTIME 1
49# endif
50# else
51# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0
53# endif
54# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0
56# endif
37# endif 57# endif
38 58
59# ifndef EV_USE_SELECT
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 60# if HAVE_SELECT && HAVE_SYS_SELECT_H
40# define EV_USE_SELECT 1 61# define EV_USE_SELECT 1
62# else
63# define EV_USE_SELECT 0
64# endif
41# endif 65# endif
42 66
67# ifndef EV_USE_POLL
43# if HAVE_POLL && HAVE_POLL_H 68# if HAVE_POLL && HAVE_POLL_H
44# define EV_USE_POLL 1 69# define EV_USE_POLL 1
70# else
71# define EV_USE_POLL 0
72# endif
45# endif 73# endif
46 74
75# ifndef EV_USE_EPOLL
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 76# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1 77# define EV_USE_EPOLL 1
78# else
79# define EV_USE_EPOLL 0
80# endif
49# endif 81# endif
50 82
83# ifndef EV_USE_KQUEUE
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 84# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1 85# define EV_USE_KQUEUE 1
86# else
87# define EV_USE_KQUEUE 0
88# endif
89# endif
90
91# ifndef EV_USE_PORT
92# if HAVE_PORT_H && HAVE_PORT_CREATE
93# define EV_USE_PORT 1
94# else
95# define EV_USE_PORT 0
96# endif
53# endif 97# endif
54 98
55#endif 99#endif
56 100
57#include <math.h> 101#include <math.h>
58#include <stdlib.h> 102#include <stdlib.h>
59#include <unistd.h>
60#include <fcntl.h> 103#include <fcntl.h>
61#include <signal.h>
62#include <stddef.h> 104#include <stddef.h>
63 105
64#include <stdio.h> 106#include <stdio.h>
65 107
66#include <assert.h> 108#include <assert.h>
67#include <errno.h> 109#include <errno.h>
68#include <sys/types.h> 110#include <sys/types.h>
111#include <time.h>
112
113#include <signal.h>
114
69#ifndef WIN32 115#ifndef _WIN32
116# include <unistd.h>
117# include <sys/time.h>
70# include <sys/wait.h> 118# include <sys/wait.h>
119#else
120# define WIN32_LEAN_AND_MEAN
121# include <windows.h>
122# ifndef EV_SELECT_IS_WINSOCKET
123# define EV_SELECT_IS_WINSOCKET 1
71#endif 124# endif
72#include <sys/time.h> 125#endif
73#include <time.h>
74 126
75/**/ 127/**/
76 128
77#ifndef EV_USE_MONOTONIC 129#ifndef EV_USE_MONOTONIC
78# define EV_USE_MONOTONIC 1 130# define EV_USE_MONOTONIC 0
131#endif
132
133#ifndef EV_USE_REALTIME
134# define EV_USE_REALTIME 0
79#endif 135#endif
80 136
81#ifndef EV_USE_SELECT 137#ifndef EV_USE_SELECT
82# define EV_USE_SELECT 1 138# define EV_USE_SELECT 1
83#endif 139#endif
84 140
85#ifndef EV_USE_POLL 141#ifndef EV_USE_POLL
86# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 142# ifdef _WIN32
143# define EV_USE_POLL 0
144# else
145# define EV_USE_POLL 1
146# endif
87#endif 147#endif
88 148
89#ifndef EV_USE_EPOLL 149#ifndef EV_USE_EPOLL
90# define EV_USE_EPOLL 0 150# define EV_USE_EPOLL 0
91#endif 151#endif
92 152
93#ifndef EV_USE_KQUEUE 153#ifndef EV_USE_KQUEUE
94# define EV_USE_KQUEUE 0 154# define EV_USE_KQUEUE 0
95#endif 155#endif
96 156
97#ifndef EV_USE_WIN32
98# ifdef WIN32
99# define EV_USE_WIN32 1
100# else
101# define EV_USE_WIN32 0
102# endif
103#endif
104
105#ifndef EV_USE_REALTIME 157#ifndef EV_USE_PORT
106# define EV_USE_REALTIME 1 158# define EV_USE_PORT 0
107#endif 159#endif
108 160
109/**/ 161/**/
110 162
111#ifndef CLOCK_MONOTONIC 163#ifndef CLOCK_MONOTONIC
116#ifndef CLOCK_REALTIME 168#ifndef CLOCK_REALTIME
117# undef EV_USE_REALTIME 169# undef EV_USE_REALTIME
118# define EV_USE_REALTIME 0 170# define EV_USE_REALTIME 0
119#endif 171#endif
120 172
173#if EV_SELECT_IS_WINSOCKET
174# include <winsock.h>
175#endif
176
121/**/ 177/**/
122 178
123#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 179#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
124#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 180#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
125#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 181#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
126/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 182/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
127 183
184#ifdef EV_H
185# include EV_H
186#else
128#include "ev.h" 187# include "ev.h"
188#endif
129 189
130#if __GNUC__ >= 3 190#if __GNUC__ >= 3
131# define expect(expr,value) __builtin_expect ((expr),(value)) 191# define expect(expr,value) __builtin_expect ((expr),(value))
132# define inline inline 192# define inline static inline
133#else 193#else
134# define expect(expr,value) (expr) 194# define expect(expr,value) (expr)
135# define inline static 195# define inline static
136#endif 196#endif
137 197
139#define expect_true(expr) expect ((expr) != 0, 1) 199#define expect_true(expr) expect ((expr) != 0, 1)
140 200
141#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 201#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
142#define ABSPRI(w) ((w)->priority - EV_MINPRI) 202#define ABSPRI(w) ((w)->priority - EV_MINPRI)
143 203
204#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
205#define EMPTY2(a,b) /* used to suppress some warnings */
206
144typedef struct ev_watcher *W; 207typedef struct ev_watcher *W;
145typedef struct ev_watcher_list *WL; 208typedef struct ev_watcher_list *WL;
146typedef struct ev_watcher_time *WT; 209typedef struct ev_watcher_time *WT;
147 210
148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 211static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
149 212
213#ifdef _WIN32
214# include "ev_win32.c"
215#endif
216
150/*****************************************************************************/ 217/*****************************************************************************/
151 218
219static void (*syserr_cb)(const char *msg);
220
221void ev_set_syserr_cb (void (*cb)(const char *msg))
222{
223 syserr_cb = cb;
224}
225
226static void
227syserr (const char *msg)
228{
229 if (!msg)
230 msg = "(libev) system error";
231
232 if (syserr_cb)
233 syserr_cb (msg);
234 else
235 {
236 perror (msg);
237 abort ();
238 }
239}
240
241static void *(*alloc)(void *ptr, long size);
242
243void ev_set_allocator (void *(*cb)(void *ptr, long size))
244{
245 alloc = cb;
246}
247
248static void *
249ev_realloc (void *ptr, long size)
250{
251 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
252
253 if (!ptr && size)
254 {
255 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
256 abort ();
257 }
258
259 return ptr;
260}
261
262#define ev_malloc(size) ev_realloc (0, (size))
263#define ev_free(ptr) ev_realloc ((ptr), 0)
264
265/*****************************************************************************/
266
152typedef struct 267typedef struct
153{ 268{
154 struct ev_watcher_list *head; 269 WL head;
155 unsigned char events; 270 unsigned char events;
156 unsigned char reify; 271 unsigned char reify;
272#if EV_SELECT_IS_WINSOCKET
273 SOCKET handle;
274#endif
157} ANFD; 275} ANFD;
158 276
159typedef struct 277typedef struct
160{ 278{
161 W w; 279 W w;
162 int events; 280 int events;
163} ANPENDING; 281} ANPENDING;
164 282
165#if EV_MULTIPLICITY 283#if EV_MULTIPLICITY
166 284
167struct ev_loop 285 struct ev_loop
168{ 286 {
287 ev_tstamp ev_rt_now;
288 #define ev_rt_now ((loop)->ev_rt_now)
169# define VAR(name,decl) decl; 289 #define VAR(name,decl) decl;
170# include "ev_vars.h" 290 #include "ev_vars.h"
171};
172# undef VAR 291 #undef VAR
292 };
173# include "ev_wrap.h" 293 #include "ev_wrap.h"
294
295 static struct ev_loop default_loop_struct;
296 struct ev_loop *ev_default_loop_ptr;
174 297
175#else 298#else
176 299
300 ev_tstamp ev_rt_now;
177# define VAR(name,decl) static decl; 301 #define VAR(name,decl) static decl;
178# include "ev_vars.h" 302 #include "ev_vars.h"
179# undef VAR 303 #undef VAR
304
305 static int ev_default_loop_ptr;
180 306
181#endif 307#endif
182 308
183/*****************************************************************************/ 309/*****************************************************************************/
184 310
185inline ev_tstamp 311ev_tstamp
186ev_time (void) 312ev_time (void)
187{ 313{
188#if EV_USE_REALTIME 314#if EV_USE_REALTIME
189 struct timespec ts; 315 struct timespec ts;
190 clock_gettime (CLOCK_REALTIME, &ts); 316 clock_gettime (CLOCK_REALTIME, &ts);
209#endif 335#endif
210 336
211 return ev_time (); 337 return ev_time ();
212} 338}
213 339
340#if EV_MULTIPLICITY
214ev_tstamp 341ev_tstamp
215ev_now (EV_P) 342ev_now (EV_P)
216{ 343{
217 return rt_now; 344 return ev_rt_now;
218} 345}
346#endif
219 347
220#define array_roundsize(base,n) ((n) | 4 & ~3) 348#define array_roundsize(type,n) (((n) | 4) & ~3)
221 349
222#define array_needsize(base,cur,cnt,init) \ 350#define array_needsize(type,base,cur,cnt,init) \
223 if (expect_false ((cnt) > cur)) \ 351 if (expect_false ((cnt) > cur)) \
224 { \ 352 { \
225 int newcnt = cur; \ 353 int newcnt = cur; \
226 do \ 354 do \
227 { \ 355 { \
228 newcnt = array_roundsize (base, newcnt << 1); \ 356 newcnt = array_roundsize (type, newcnt << 1); \
229 } \ 357 } \
230 while ((cnt) > newcnt); \ 358 while ((cnt) > newcnt); \
231 \ 359 \
232 base = realloc (base, sizeof (*base) * (newcnt)); \ 360 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
233 init (base + cur, newcnt - cur); \ 361 init (base + cur, newcnt - cur); \
234 cur = newcnt; \ 362 cur = newcnt; \
235 } 363 }
364
365#define array_slim(type,stem) \
366 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
367 { \
368 stem ## max = array_roundsize (stem ## cnt >> 1); \
369 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
370 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
371 }
372
373#define array_free(stem, idx) \
374 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
236 375
237/*****************************************************************************/ 376/*****************************************************************************/
238 377
239static void 378static void
240anfds_init (ANFD *base, int count) 379anfds_init (ANFD *base, int count)
247 386
248 ++base; 387 ++base;
249 } 388 }
250} 389}
251 390
252static void 391void
253event (EV_P_ W w, int events) 392ev_feed_event (EV_P_ void *w, int revents)
254{ 393{
255 if (w->pending) 394 W w_ = (W)w;
395
396 if (expect_false (w_->pending))
256 { 397 {
257 pendings [ABSPRI (w)][w->pending - 1].events |= events; 398 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
258 return; 399 return;
259 } 400 }
260 401
261 w->pending = ++pendingcnt [ABSPRI (w)]; 402 w_->pending = ++pendingcnt [ABSPRI (w_)];
262 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 403 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
263 pendings [ABSPRI (w)][w->pending - 1].w = w; 404 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
264 pendings [ABSPRI (w)][w->pending - 1].events = events; 405 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
265} 406}
266 407
267static void 408static void
268queue_events (EV_P_ W *events, int eventcnt, int type) 409queue_events (EV_P_ W *events, int eventcnt, int type)
269{ 410{
270 int i; 411 int i;
271 412
272 for (i = 0; i < eventcnt; ++i) 413 for (i = 0; i < eventcnt; ++i)
273 event (EV_A_ events [i], type); 414 ev_feed_event (EV_A_ events [i], type);
274} 415}
275 416
276static void 417inline void
277fd_event (EV_P_ int fd, int events) 418fd_event (EV_P_ int fd, int revents)
278{ 419{
279 ANFD *anfd = anfds + fd; 420 ANFD *anfd = anfds + fd;
280 struct ev_io *w; 421 struct ev_io *w;
281 422
282 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 423 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
283 { 424 {
284 int ev = w->events & events; 425 int ev = w->events & revents;
285 426
286 if (ev) 427 if (ev)
287 event (EV_A_ (W)w, ev); 428 ev_feed_event (EV_A_ (W)w, ev);
288 } 429 }
430}
431
432void
433ev_feed_fd_event (EV_P_ int fd, int revents)
434{
435 fd_event (EV_A_ fd, revents);
289} 436}
290 437
291/*****************************************************************************/ 438/*****************************************************************************/
292 439
293static void 440inline void
294fd_reify (EV_P) 441fd_reify (EV_P)
295{ 442{
296 int i; 443 int i;
297 444
298 for (i = 0; i < fdchangecnt; ++i) 445 for (i = 0; i < fdchangecnt; ++i)
304 int events = 0; 451 int events = 0;
305 452
306 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 453 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
307 events |= w->events; 454 events |= w->events;
308 455
456#if EV_SELECT_IS_WINSOCKET
457 if (events)
458 {
459 unsigned long argp;
460 anfd->handle = _get_osfhandle (fd);
461 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
462 }
463#endif
464
309 anfd->reify = 0; 465 anfd->reify = 0;
310 466
311 method_modify (EV_A_ fd, anfd->events, events); 467 backend_modify (EV_A_ fd, anfd->events, events);
312 anfd->events = events; 468 anfd->events = events;
313 } 469 }
314 470
315 fdchangecnt = 0; 471 fdchangecnt = 0;
316} 472}
317 473
318static void 474static void
319fd_change (EV_P_ int fd) 475fd_change (EV_P_ int fd)
320{ 476{
321 if (anfds [fd].reify || fdchangecnt < 0) 477 if (expect_false (anfds [fd].reify))
322 return; 478 return;
323 479
324 anfds [fd].reify = 1; 480 anfds [fd].reify = 1;
325 481
326 ++fdchangecnt; 482 ++fdchangecnt;
327 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 483 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
328 fdchanges [fdchangecnt - 1] = fd; 484 fdchanges [fdchangecnt - 1] = fd;
329} 485}
330 486
331static void 487static void
332fd_kill (EV_P_ int fd) 488fd_kill (EV_P_ int fd)
334 struct ev_io *w; 490 struct ev_io *w;
335 491
336 while ((w = (struct ev_io *)anfds [fd].head)) 492 while ((w = (struct ev_io *)anfds [fd].head))
337 { 493 {
338 ev_io_stop (EV_A_ w); 494 ev_io_stop (EV_A_ w);
339 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 495 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
340 } 496 }
497}
498
499inline int
500fd_valid (int fd)
501{
502#ifdef _WIN32
503 return _get_osfhandle (fd) != -1;
504#else
505 return fcntl (fd, F_GETFD) != -1;
506#endif
341} 507}
342 508
343/* called on EBADF to verify fds */ 509/* called on EBADF to verify fds */
344static void 510static void
345fd_ebadf (EV_P) 511fd_ebadf (EV_P)
346{ 512{
347 int fd; 513 int fd;
348 514
349 for (fd = 0; fd < anfdmax; ++fd) 515 for (fd = 0; fd < anfdmax; ++fd)
350 if (anfds [fd].events) 516 if (anfds [fd].events)
351 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 517 if (!fd_valid (fd) == -1 && errno == EBADF)
352 fd_kill (EV_A_ fd); 518 fd_kill (EV_A_ fd);
353} 519}
354 520
355/* called on ENOMEM in select/poll to kill some fds and retry */ 521/* called on ENOMEM in select/poll to kill some fds and retry */
356static void 522static void
359 int fd; 525 int fd;
360 526
361 for (fd = anfdmax; fd--; ) 527 for (fd = anfdmax; fd--; )
362 if (anfds [fd].events) 528 if (anfds [fd].events)
363 { 529 {
364 close (fd);
365 fd_kill (EV_A_ fd); 530 fd_kill (EV_A_ fd);
366 return; 531 return;
367 } 532 }
368} 533}
369 534
370/* susually called after fork if method needs to re-arm all fds from scratch */ 535/* usually called after fork if backend needs to re-arm all fds from scratch */
371static void 536static void
372fd_rearm_all (EV_P) 537fd_rearm_all (EV_P)
373{ 538{
374 int fd; 539 int fd;
375 540
423 588
424 heap [k] = w; 589 heap [k] = w;
425 ((W)heap [k])->active = k + 1; 590 ((W)heap [k])->active = k + 1;
426} 591}
427 592
593inline void
594adjustheap (WT *heap, int N, int k)
595{
596 upheap (heap, k);
597 downheap (heap, N, k);
598}
599
428/*****************************************************************************/ 600/*****************************************************************************/
429 601
430typedef struct 602typedef struct
431{ 603{
432 struct ev_watcher_list *head; 604 WL head;
433 sig_atomic_t volatile gotsig; 605 sig_atomic_t volatile gotsig;
434} ANSIG; 606} ANSIG;
435 607
436static ANSIG *signals; 608static ANSIG *signals;
437static int signalmax; 609static int signalmax;
453} 625}
454 626
455static void 627static void
456sighandler (int signum) 628sighandler (int signum)
457{ 629{
630#if _WIN32
631 signal (signum, sighandler);
632#endif
633
458 signals [signum - 1].gotsig = 1; 634 signals [signum - 1].gotsig = 1;
459 635
460 if (!gotsig) 636 if (!gotsig)
461 { 637 {
462 int old_errno = errno; 638 int old_errno = errno;
464 write (sigpipe [1], &signum, 1); 640 write (sigpipe [1], &signum, 1);
465 errno = old_errno; 641 errno = old_errno;
466 } 642 }
467} 643}
468 644
645void
646ev_feed_signal_event (EV_P_ int signum)
647{
648 WL w;
649
650#if EV_MULTIPLICITY
651 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
652#endif
653
654 --signum;
655
656 if (signum < 0 || signum >= signalmax)
657 return;
658
659 signals [signum].gotsig = 0;
660
661 for (w = signals [signum].head; w; w = w->next)
662 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
663}
664
469static void 665static void
470sigcb (EV_P_ struct ev_io *iow, int revents) 666sigcb (EV_P_ struct ev_io *iow, int revents)
471{ 667{
472 struct ev_watcher_list *w;
473 int signum; 668 int signum;
474 669
475 read (sigpipe [0], &revents, 1); 670 read (sigpipe [0], &revents, 1);
476 gotsig = 0; 671 gotsig = 0;
477 672
478 for (signum = signalmax; signum--; ) 673 for (signum = signalmax; signum--; )
479 if (signals [signum].gotsig) 674 if (signals [signum].gotsig)
480 { 675 ev_feed_signal_event (EV_A_ signum + 1);
481 signals [signum].gotsig = 0; 676}
482 677
483 for (w = signals [signum].head; w; w = w->next) 678static void
484 event (EV_A_ (W)w, EV_SIGNAL); 679fd_intern (int fd)
485 } 680{
681#ifdef _WIN32
682 int arg = 1;
683 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
684#else
685 fcntl (fd, F_SETFD, FD_CLOEXEC);
686 fcntl (fd, F_SETFL, O_NONBLOCK);
687#endif
486} 688}
487 689
488static void 690static void
489siginit (EV_P) 691siginit (EV_P)
490{ 692{
491#ifndef WIN32 693 fd_intern (sigpipe [0]);
492 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 694 fd_intern (sigpipe [1]);
493 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
494
495 /* rather than sort out wether we really need nb, set it */
496 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
497 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
498#endif
499 695
500 ev_io_set (&sigev, sigpipe [0], EV_READ); 696 ev_io_set (&sigev, sigpipe [0], EV_READ);
501 ev_io_start (EV_A_ &sigev); 697 ev_io_start (EV_A_ &sigev);
502 ev_unref (EV_A); /* child watcher should not keep loop alive */ 698 ev_unref (EV_A); /* child watcher should not keep loop alive */
503} 699}
504 700
505/*****************************************************************************/ 701/*****************************************************************************/
506 702
507#ifndef WIN32
508
509static struct ev_child *childs [PID_HASHSIZE]; 703static struct ev_child *childs [PID_HASHSIZE];
704
705#ifndef _WIN32
706
510static struct ev_signal childev; 707static struct ev_signal childev;
511 708
512#ifndef WCONTINUED 709#ifndef WCONTINUED
513# define WCONTINUED 0 710# define WCONTINUED 0
514#endif 711#endif
522 if (w->pid == pid || !w->pid) 719 if (w->pid == pid || !w->pid)
523 { 720 {
524 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 721 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
525 w->rpid = pid; 722 w->rpid = pid;
526 w->rstatus = status; 723 w->rstatus = status;
527 event (EV_A_ (W)w, EV_CHILD); 724 ev_feed_event (EV_A_ (W)w, EV_CHILD);
528 } 725 }
529} 726}
530 727
531static void 728static void
532childcb (EV_P_ struct ev_signal *sw, int revents) 729childcb (EV_P_ struct ev_signal *sw, int revents)
534 int pid, status; 731 int pid, status;
535 732
536 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 733 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
537 { 734 {
538 /* make sure we are called again until all childs have been reaped */ 735 /* make sure we are called again until all childs have been reaped */
736 /* we need to do it this way so that the callback gets called before we continue */
539 event (EV_A_ (W)sw, EV_SIGNAL); 737 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
540 738
541 child_reap (EV_A_ sw, pid, pid, status); 739 child_reap (EV_A_ sw, pid, pid, status);
542 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 740 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
543 } 741 }
544} 742}
545 743
546#endif 744#endif
547 745
548/*****************************************************************************/ 746/*****************************************************************************/
549 747
748#if EV_USE_PORT
749# include "ev_port.c"
750#endif
550#if EV_USE_KQUEUE 751#if EV_USE_KQUEUE
551# include "ev_kqueue.c" 752# include "ev_kqueue.c"
552#endif 753#endif
553#if EV_USE_EPOLL 754#if EV_USE_EPOLL
554# include "ev_epoll.c" 755# include "ev_epoll.c"
574 775
575/* return true if we are running with elevated privileges and should ignore env variables */ 776/* return true if we are running with elevated privileges and should ignore env variables */
576static int 777static int
577enable_secure (void) 778enable_secure (void)
578{ 779{
579#ifdef WIN32 780#ifdef _WIN32
580 return 0; 781 return 0;
581#else 782#else
582 return getuid () != geteuid () 783 return getuid () != geteuid ()
583 || getgid () != getegid (); 784 || getgid () != getegid ();
584#endif 785#endif
585} 786}
586 787
587int 788unsigned int
588ev_method (EV_P) 789ev_supported_backends (void)
589{ 790{
590 return method; 791 unsigned int flags = 0;
591}
592 792
593static void 793 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
594loop_init (EV_P_ int methods) 794 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
795 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
796 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
797 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
798
799 return flags;
800}
801
802unsigned int
803ev_recommended_backends (void)
595{ 804{
596 if (!method) 805 unsigned int flags = ev_supported_backends ();
806
807#ifndef __NetBSD__
808 /* kqueue is borked on everything but netbsd apparently */
809 /* it usually doesn't work correctly on anything but sockets and pipes */
810 flags &= ~EVBACKEND_KQUEUE;
811#endif
812#ifdef __APPLE__
813 // flags &= ~EVBACKEND_KQUEUE; for documentation
814 flags &= ~EVBACKEND_POLL;
815#endif
816
817 return flags;
818}
819
820unsigned int
821ev_backend (EV_P)
822{
823 return backend;
824}
825
826static void
827loop_init (EV_P_ unsigned int flags)
828{
829 if (!backend)
597 { 830 {
598#if EV_USE_MONOTONIC 831#if EV_USE_MONOTONIC
599 { 832 {
600 struct timespec ts; 833 struct timespec ts;
601 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 834 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
602 have_monotonic = 1; 835 have_monotonic = 1;
603 } 836 }
604#endif 837#endif
605 838
606 rt_now = ev_time (); 839 ev_rt_now = ev_time ();
607 mn_now = get_clock (); 840 mn_now = get_clock ();
608 now_floor = mn_now; 841 now_floor = mn_now;
609 rtmn_diff = rt_now - mn_now; 842 rtmn_diff = ev_rt_now - mn_now;
610 843
611 if (methods == EVMETHOD_AUTO) 844 if (!(flags & EVFLAG_NOENV)
612 if (!enable_secure () && getenv ("LIBEV_METHODS")) 845 && !enable_secure ()
846 && getenv ("LIBEV_FLAGS"))
613 methods = atoi (getenv ("LIBEV_METHODS")); 847 flags = atoi (getenv ("LIBEV_FLAGS"));
614 else
615 methods = EVMETHOD_ANY;
616 848
617 method = 0; 849 if (!(flags & 0x0000ffffUL))
618#if EV_USE_WIN32 850 flags |= ev_recommended_backends ();
619 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 851
852 backend = 0;
853#if EV_USE_PORT
854 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
620#endif 855#endif
621#if EV_USE_KQUEUE 856#if EV_USE_KQUEUE
622 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 857 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
623#endif 858#endif
624#if EV_USE_EPOLL 859#if EV_USE_EPOLL
625 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 860 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
626#endif 861#endif
627#if EV_USE_POLL 862#if EV_USE_POLL
628 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 863 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
629#endif 864#endif
630#if EV_USE_SELECT 865#if EV_USE_SELECT
631 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 866 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
632#endif 867#endif
633 }
634}
635 868
636void 869 ev_init (&sigev, sigcb);
870 ev_set_priority (&sigev, EV_MAXPRI);
871 }
872}
873
874static void
637loop_destroy (EV_P) 875loop_destroy (EV_P)
638{ 876{
639#if EV_USE_WIN32 877 int i;
640 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 878
879#if EV_USE_PORT
880 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
641#endif 881#endif
642#if EV_USE_KQUEUE 882#if EV_USE_KQUEUE
643 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 883 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
644#endif 884#endif
645#if EV_USE_EPOLL 885#if EV_USE_EPOLL
646 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 886 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
647#endif 887#endif
648#if EV_USE_POLL 888#if EV_USE_POLL
649 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 889 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
650#endif 890#endif
651#if EV_USE_SELECT 891#if EV_USE_SELECT
652 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 892 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
653#endif 893#endif
654 894
655 method = 0; 895 for (i = NUMPRI; i--; )
656 /*TODO*/ 896 array_free (pending, [i]);
657}
658 897
659void 898 /* have to use the microsoft-never-gets-it-right macro */
899 array_free (fdchange, EMPTY0);
900 array_free (timer, EMPTY0);
901#if EV_PERIODICS
902 array_free (periodic, EMPTY0);
903#endif
904 array_free (idle, EMPTY0);
905 array_free (prepare, EMPTY0);
906 array_free (check, EMPTY0);
907
908 backend = 0;
909}
910
911static void
660loop_fork (EV_P) 912loop_fork (EV_P)
661{ 913{
662 /*TODO*/ 914#if EV_USE_PORT
915 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
916#endif
917#if EV_USE_KQUEUE
918 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
919#endif
663#if EV_USE_EPOLL 920#if EV_USE_EPOLL
664 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 921 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
665#endif 922#endif
666#if EV_USE_KQUEUE 923
667 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 924 if (ev_is_active (&sigev))
668#endif 925 {
926 /* default loop */
927
928 ev_ref (EV_A);
929 ev_io_stop (EV_A_ &sigev);
930 close (sigpipe [0]);
931 close (sigpipe [1]);
932
933 while (pipe (sigpipe))
934 syserr ("(libev) error creating pipe");
935
936 siginit (EV_A);
937 }
938
939 postfork = 0;
669} 940}
670 941
671#if EV_MULTIPLICITY 942#if EV_MULTIPLICITY
672struct ev_loop * 943struct ev_loop *
673ev_loop_new (int methods) 944ev_loop_new (unsigned int flags)
674{ 945{
675 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 946 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
676 947
948 memset (loop, 0, sizeof (struct ev_loop));
949
677 loop_init (EV_A_ methods); 950 loop_init (EV_A_ flags);
678 951
679 if (ev_method (EV_A)) 952 if (ev_backend (EV_A))
680 return loop; 953 return loop;
681 954
682 return 0; 955 return 0;
683} 956}
684 957
685void 958void
686ev_loop_destroy (EV_P) 959ev_loop_destroy (EV_P)
687{ 960{
688 loop_destroy (EV_A); 961 loop_destroy (EV_A);
689 free (loop); 962 ev_free (loop);
690} 963}
691 964
692void 965void
693ev_loop_fork (EV_P) 966ev_loop_fork (EV_P)
694{ 967{
695 loop_fork (EV_A); 968 postfork = 1;
696} 969}
697 970
698#endif 971#endif
699 972
700#if EV_MULTIPLICITY 973#if EV_MULTIPLICITY
701struct ev_loop default_loop_struct;
702static struct ev_loop *default_loop;
703
704struct ev_loop * 974struct ev_loop *
975ev_default_loop_init (unsigned int flags)
705#else 976#else
706static int default_loop;
707
708int 977int
978ev_default_loop (unsigned int flags)
709#endif 979#endif
710ev_default_loop (int methods)
711{ 980{
712 if (sigpipe [0] == sigpipe [1]) 981 if (sigpipe [0] == sigpipe [1])
713 if (pipe (sigpipe)) 982 if (pipe (sigpipe))
714 return 0; 983 return 0;
715 984
716 if (!default_loop) 985 if (!ev_default_loop_ptr)
717 { 986 {
718#if EV_MULTIPLICITY 987#if EV_MULTIPLICITY
719 struct ev_loop *loop = default_loop = &default_loop_struct; 988 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
720#else 989#else
721 default_loop = 1; 990 ev_default_loop_ptr = 1;
722#endif 991#endif
723 992
724 loop_init (EV_A_ methods); 993 loop_init (EV_A_ flags);
725 994
726 if (ev_method (EV_A)) 995 if (ev_backend (EV_A))
727 { 996 {
728 ev_watcher_init (&sigev, sigcb);
729 ev_set_priority (&sigev, EV_MAXPRI);
730 siginit (EV_A); 997 siginit (EV_A);
731 998
732#ifndef WIN32 999#ifndef _WIN32
733 ev_signal_init (&childev, childcb, SIGCHLD); 1000 ev_signal_init (&childev, childcb, SIGCHLD);
734 ev_set_priority (&childev, EV_MAXPRI); 1001 ev_set_priority (&childev, EV_MAXPRI);
735 ev_signal_start (EV_A_ &childev); 1002 ev_signal_start (EV_A_ &childev);
736 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1003 ev_unref (EV_A); /* child watcher should not keep loop alive */
737#endif 1004#endif
738 } 1005 }
739 else 1006 else
740 default_loop = 0; 1007 ev_default_loop_ptr = 0;
741 } 1008 }
742 1009
743 return default_loop; 1010 return ev_default_loop_ptr;
744} 1011}
745 1012
746void 1013void
747ev_default_destroy (void) 1014ev_default_destroy (void)
748{ 1015{
749#if EV_MULTIPLICITY 1016#if EV_MULTIPLICITY
750 struct ev_loop *loop = default_loop; 1017 struct ev_loop *loop = ev_default_loop_ptr;
751#endif 1018#endif
752 1019
1020#ifndef _WIN32
753 ev_ref (EV_A); /* child watcher */ 1021 ev_ref (EV_A); /* child watcher */
754 ev_signal_stop (EV_A_ &childev); 1022 ev_signal_stop (EV_A_ &childev);
1023#endif
755 1024
756 ev_ref (EV_A); /* signal watcher */ 1025 ev_ref (EV_A); /* signal watcher */
757 ev_io_stop (EV_A_ &sigev); 1026 ev_io_stop (EV_A_ &sigev);
758 1027
759 close (sigpipe [0]); sigpipe [0] = 0; 1028 close (sigpipe [0]); sigpipe [0] = 0;
764 1033
765void 1034void
766ev_default_fork (void) 1035ev_default_fork (void)
767{ 1036{
768#if EV_MULTIPLICITY 1037#if EV_MULTIPLICITY
769 struct ev_loop *loop = default_loop; 1038 struct ev_loop *loop = ev_default_loop_ptr;
770#endif 1039#endif
771 1040
772 loop_fork (EV_A); 1041 if (backend)
773 1042 postfork = 1;
774 ev_io_stop (EV_A_ &sigev);
775 close (sigpipe [0]);
776 close (sigpipe [1]);
777 pipe (sigpipe);
778
779 ev_ref (EV_A); /* signal watcher */
780 siginit (EV_A);
781} 1043}
782 1044
783/*****************************************************************************/ 1045/*****************************************************************************/
784 1046
785static void 1047static int
1048any_pending (EV_P)
1049{
1050 int pri;
1051
1052 for (pri = NUMPRI; pri--; )
1053 if (pendingcnt [pri])
1054 return 1;
1055
1056 return 0;
1057}
1058
1059inline void
786call_pending (EV_P) 1060call_pending (EV_P)
787{ 1061{
788 int pri; 1062 int pri;
789 1063
790 for (pri = NUMPRI; pri--; ) 1064 for (pri = NUMPRI; pri--; )
791 while (pendingcnt [pri]) 1065 while (pendingcnt [pri])
792 { 1066 {
793 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1067 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
794 1068
795 if (p->w) 1069 if (expect_true (p->w))
796 { 1070 {
797 p->w->pending = 0; 1071 p->w->pending = 0;
798 1072 EV_CB_INVOKE (p->w, p->events);
799 (*(void (**)(EV_P_ W, int))&p->w->cb) (EV_A_ p->w, p->events);
800 } 1073 }
801 } 1074 }
802} 1075}
803 1076
804static void 1077inline void
805timers_reify (EV_P) 1078timers_reify (EV_P)
806{ 1079{
807 while (timercnt && ((WT)timers [0])->at <= mn_now) 1080 while (timercnt && ((WT)timers [0])->at <= mn_now)
808 { 1081 {
809 struct ev_timer *w = timers [0]; 1082 struct ev_timer *w = timers [0];
812 1085
813 /* first reschedule or stop timer */ 1086 /* first reschedule or stop timer */
814 if (w->repeat) 1087 if (w->repeat)
815 { 1088 {
816 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1089 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1090
817 ((WT)w)->at = mn_now + w->repeat; 1091 ((WT)w)->at += w->repeat;
1092 if (((WT)w)->at < mn_now)
1093 ((WT)w)->at = mn_now;
1094
818 downheap ((WT *)timers, timercnt, 0); 1095 downheap ((WT *)timers, timercnt, 0);
819 } 1096 }
820 else 1097 else
821 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1098 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
822 1099
823 event (EV_A_ (W)w, EV_TIMEOUT); 1100 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
824 } 1101 }
825} 1102}
826 1103
827static void 1104#if EV_PERIODICS
1105inline void
828periodics_reify (EV_P) 1106periodics_reify (EV_P)
829{ 1107{
830 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1108 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
831 { 1109 {
832 struct ev_periodic *w = periodics [0]; 1110 struct ev_periodic *w = periodics [0];
833 1111
834 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1112 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
835 1113
836 /* first reschedule or stop timer */ 1114 /* first reschedule or stop timer */
837 if (w->interval) 1115 if (w->reschedule_cb)
838 { 1116 {
1117 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1118 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1119 downheap ((WT *)periodics, periodiccnt, 0);
1120 }
1121 else if (w->interval)
1122 {
839 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1123 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
840 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1124 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
841 downheap ((WT *)periodics, periodiccnt, 0); 1125 downheap ((WT *)periodics, periodiccnt, 0);
842 } 1126 }
843 else 1127 else
844 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1128 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
845 1129
846 event (EV_A_ (W)w, EV_PERIODIC); 1130 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
847 } 1131 }
848} 1132}
849 1133
850static void 1134static void
851periodics_reschedule (EV_P) 1135periodics_reschedule (EV_P)
855 /* adjust periodics after time jump */ 1139 /* adjust periodics after time jump */
856 for (i = 0; i < periodiccnt; ++i) 1140 for (i = 0; i < periodiccnt; ++i)
857 { 1141 {
858 struct ev_periodic *w = periodics [i]; 1142 struct ev_periodic *w = periodics [i];
859 1143
1144 if (w->reschedule_cb)
1145 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
860 if (w->interval) 1146 else if (w->interval)
861 {
862 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1147 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
863
864 if (fabs (diff) >= 1e-4)
865 {
866 ev_periodic_stop (EV_A_ w);
867 ev_periodic_start (EV_A_ w);
868
869 i = 0; /* restart loop, inefficient, but time jumps should be rare */
870 }
871 }
872 } 1148 }
1149
1150 /* now rebuild the heap */
1151 for (i = periodiccnt >> 1; i--; )
1152 downheap ((WT *)periodics, periodiccnt, i);
873} 1153}
1154#endif
874 1155
875inline int 1156inline int
876time_update_monotonic (EV_P) 1157time_update_monotonic (EV_P)
877{ 1158{
878 mn_now = get_clock (); 1159 mn_now = get_clock ();
879 1160
880 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1161 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
881 { 1162 {
882 rt_now = rtmn_diff + mn_now; 1163 ev_rt_now = rtmn_diff + mn_now;
883 return 0; 1164 return 0;
884 } 1165 }
885 else 1166 else
886 { 1167 {
887 now_floor = mn_now; 1168 now_floor = mn_now;
888 rt_now = ev_time (); 1169 ev_rt_now = ev_time ();
889 return 1; 1170 return 1;
890 } 1171 }
891} 1172}
892 1173
893static void 1174inline void
894time_update (EV_P) 1175time_update (EV_P)
895{ 1176{
896 int i; 1177 int i;
897 1178
898#if EV_USE_MONOTONIC 1179#if EV_USE_MONOTONIC
902 { 1183 {
903 ev_tstamp odiff = rtmn_diff; 1184 ev_tstamp odiff = rtmn_diff;
904 1185
905 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1186 for (i = 4; --i; ) /* loop a few times, before making important decisions */
906 { 1187 {
907 rtmn_diff = rt_now - mn_now; 1188 rtmn_diff = ev_rt_now - mn_now;
908 1189
909 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1190 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
910 return; /* all is well */ 1191 return; /* all is well */
911 1192
912 rt_now = ev_time (); 1193 ev_rt_now = ev_time ();
913 mn_now = get_clock (); 1194 mn_now = get_clock ();
914 now_floor = mn_now; 1195 now_floor = mn_now;
915 } 1196 }
916 1197
1198# if EV_PERIODICS
917 periodics_reschedule (EV_A); 1199 periodics_reschedule (EV_A);
1200# endif
918 /* no timer adjustment, as the monotonic clock doesn't jump */ 1201 /* no timer adjustment, as the monotonic clock doesn't jump */
919 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1202 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
920 } 1203 }
921 } 1204 }
922 else 1205 else
923#endif 1206#endif
924 { 1207 {
925 rt_now = ev_time (); 1208 ev_rt_now = ev_time ();
926 1209
927 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1210 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
928 { 1211 {
1212#if EV_PERIODICS
929 periodics_reschedule (EV_A); 1213 periodics_reschedule (EV_A);
1214#endif
930 1215
931 /* adjust timers. this is easy, as the offset is the same for all */ 1216 /* adjust timers. this is easy, as the offset is the same for all */
932 for (i = 0; i < timercnt; ++i) 1217 for (i = 0; i < timercnt; ++i)
933 ((WT)timers [i])->at += rt_now - mn_now; 1218 ((WT)timers [i])->at += ev_rt_now - mn_now;
934 } 1219 }
935 1220
936 mn_now = rt_now; 1221 mn_now = ev_rt_now;
937 } 1222 }
938} 1223}
939 1224
940void 1225void
941ev_ref (EV_P) 1226ev_ref (EV_P)
955ev_loop (EV_P_ int flags) 1240ev_loop (EV_P_ int flags)
956{ 1241{
957 double block; 1242 double block;
958 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1243 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
959 1244
960 do 1245 while (activecnt)
961 { 1246 {
962 /* queue check watchers (and execute them) */ 1247 /* queue check watchers (and execute them) */
963 if (expect_false (preparecnt)) 1248 if (expect_false (preparecnt))
964 { 1249 {
965 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1250 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
966 call_pending (EV_A); 1251 call_pending (EV_A);
967 } 1252 }
968 1253
1254 /* we might have forked, so reify kernel state if necessary */
1255 if (expect_false (postfork))
1256 loop_fork (EV_A);
1257
969 /* update fd-related kernel structures */ 1258 /* update fd-related kernel structures */
970 fd_reify (EV_A); 1259 fd_reify (EV_A);
971 1260
972 /* calculate blocking time */ 1261 /* calculate blocking time */
973 1262
974 /* we only need this for !monotonic clockor timers, but as we basically 1263 /* we only need this for !monotonic clock or timers, but as we basically
975 always have timers, we just calculate it always */ 1264 always have timers, we just calculate it always */
976#if EV_USE_MONOTONIC 1265#if EV_USE_MONOTONIC
977 if (expect_true (have_monotonic)) 1266 if (expect_true (have_monotonic))
978 time_update_monotonic (EV_A); 1267 time_update_monotonic (EV_A);
979 else 1268 else
980#endif 1269#endif
981 { 1270 {
982 rt_now = ev_time (); 1271 ev_rt_now = ev_time ();
983 mn_now = rt_now; 1272 mn_now = ev_rt_now;
984 } 1273 }
985 1274
986 if (flags & EVLOOP_NONBLOCK || idlecnt) 1275 if (flags & EVLOOP_NONBLOCK || idlecnt)
987 block = 0.; 1276 block = 0.;
988 else 1277 else
989 { 1278 {
990 block = MAX_BLOCKTIME; 1279 block = MAX_BLOCKTIME;
991 1280
992 if (timercnt) 1281 if (timercnt)
993 { 1282 {
994 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1283 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
995 if (block > to) block = to; 1284 if (block > to) block = to;
996 } 1285 }
997 1286
1287#if EV_PERIODICS
998 if (periodiccnt) 1288 if (periodiccnt)
999 { 1289 {
1000 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1290 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1001 if (block > to) block = to; 1291 if (block > to) block = to;
1002 } 1292 }
1293#endif
1003 1294
1004 if (block < 0.) block = 0.; 1295 if (expect_false (block < 0.)) block = 0.;
1005 } 1296 }
1006 1297
1007 method_poll (EV_A_ block); 1298 backend_poll (EV_A_ block);
1008 1299
1009 /* update rt_now, do magic */ 1300 /* update ev_rt_now, do magic */
1010 time_update (EV_A); 1301 time_update (EV_A);
1011 1302
1012 /* queue pending timers and reschedule them */ 1303 /* queue pending timers and reschedule them */
1013 timers_reify (EV_A); /* relative timers called last */ 1304 timers_reify (EV_A); /* relative timers called last */
1305#if EV_PERIODICS
1014 periodics_reify (EV_A); /* absolute timers called first */ 1306 periodics_reify (EV_A); /* absolute timers called first */
1307#endif
1015 1308
1016 /* queue idle watchers unless io or timers are pending */ 1309 /* queue idle watchers unless io or timers are pending */
1017 if (!pendingcnt) 1310 if (idlecnt && !any_pending (EV_A))
1018 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1311 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1019 1312
1020 /* queue check watchers, to be executed first */ 1313 /* queue check watchers, to be executed first */
1021 if (checkcnt) 1314 if (expect_false (checkcnt))
1022 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1315 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1023 1316
1024 call_pending (EV_A); 1317 call_pending (EV_A);
1318
1319 if (expect_false (loop_done))
1320 break;
1025 } 1321 }
1026 while (activecnt && !loop_done);
1027 1322
1028 if (loop_done != 2) 1323 if (loop_done != 2)
1029 loop_done = 0; 1324 loop_done = 0;
1030} 1325}
1031 1326
1091void 1386void
1092ev_io_start (EV_P_ struct ev_io *w) 1387ev_io_start (EV_P_ struct ev_io *w)
1093{ 1388{
1094 int fd = w->fd; 1389 int fd = w->fd;
1095 1390
1096 if (ev_is_active (w)) 1391 if (expect_false (ev_is_active (w)))
1097 return; 1392 return;
1098 1393
1099 assert (("ev_io_start called with negative fd", fd >= 0)); 1394 assert (("ev_io_start called with negative fd", fd >= 0));
1100 1395
1101 ev_start (EV_A_ (W)w, 1); 1396 ev_start (EV_A_ (W)w, 1);
1102 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1397 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1103 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1398 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1104 1399
1105 fd_change (EV_A_ fd); 1400 fd_change (EV_A_ fd);
1106} 1401}
1107 1402
1108void 1403void
1109ev_io_stop (EV_P_ struct ev_io *w) 1404ev_io_stop (EV_P_ struct ev_io *w)
1110{ 1405{
1111 ev_clear_pending (EV_A_ (W)w); 1406 ev_clear_pending (EV_A_ (W)w);
1112 if (!ev_is_active (w)) 1407 if (expect_false (!ev_is_active (w)))
1113 return; 1408 return;
1409
1410 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1114 1411
1115 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1412 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1116 ev_stop (EV_A_ (W)w); 1413 ev_stop (EV_A_ (W)w);
1117 1414
1118 fd_change (EV_A_ w->fd); 1415 fd_change (EV_A_ w->fd);
1119} 1416}
1120 1417
1121void 1418void
1122ev_timer_start (EV_P_ struct ev_timer *w) 1419ev_timer_start (EV_P_ struct ev_timer *w)
1123{ 1420{
1124 if (ev_is_active (w)) 1421 if (expect_false (ev_is_active (w)))
1125 return; 1422 return;
1126 1423
1127 ((WT)w)->at += mn_now; 1424 ((WT)w)->at += mn_now;
1128 1425
1129 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1426 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1130 1427
1131 ev_start (EV_A_ (W)w, ++timercnt); 1428 ev_start (EV_A_ (W)w, ++timercnt);
1132 array_needsize (timers, timermax, timercnt, ); 1429 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1133 timers [timercnt - 1] = w; 1430 timers [timercnt - 1] = w;
1134 upheap ((WT *)timers, timercnt - 1); 1431 upheap ((WT *)timers, timercnt - 1);
1135 1432
1136 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1433 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1137} 1434}
1138 1435
1139void 1436void
1140ev_timer_stop (EV_P_ struct ev_timer *w) 1437ev_timer_stop (EV_P_ struct ev_timer *w)
1141{ 1438{
1142 ev_clear_pending (EV_A_ (W)w); 1439 ev_clear_pending (EV_A_ (W)w);
1143 if (!ev_is_active (w)) 1440 if (expect_false (!ev_is_active (w)))
1144 return; 1441 return;
1145 1442
1146 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1443 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1147 1444
1148 if (((W)w)->active < timercnt--) 1445 if (expect_true (((W)w)->active < timercnt--))
1149 { 1446 {
1150 timers [((W)w)->active - 1] = timers [timercnt]; 1447 timers [((W)w)->active - 1] = timers [timercnt];
1151 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1448 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1152 } 1449 }
1153 1450
1154 ((WT)w)->at = w->repeat; 1451 ((WT)w)->at -= mn_now;
1155 1452
1156 ev_stop (EV_A_ (W)w); 1453 ev_stop (EV_A_ (W)w);
1157} 1454}
1158 1455
1159void 1456void
1162 if (ev_is_active (w)) 1459 if (ev_is_active (w))
1163 { 1460 {
1164 if (w->repeat) 1461 if (w->repeat)
1165 { 1462 {
1166 ((WT)w)->at = mn_now + w->repeat; 1463 ((WT)w)->at = mn_now + w->repeat;
1167 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1464 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1168 } 1465 }
1169 else 1466 else
1170 ev_timer_stop (EV_A_ w); 1467 ev_timer_stop (EV_A_ w);
1171 } 1468 }
1172 else if (w->repeat) 1469 else if (w->repeat)
1470 {
1471 w->at = w->repeat;
1173 ev_timer_start (EV_A_ w); 1472 ev_timer_start (EV_A_ w);
1473 }
1174} 1474}
1175 1475
1476#if EV_PERIODICS
1176void 1477void
1177ev_periodic_start (EV_P_ struct ev_periodic *w) 1478ev_periodic_start (EV_P_ struct ev_periodic *w)
1178{ 1479{
1179 if (ev_is_active (w)) 1480 if (expect_false (ev_is_active (w)))
1180 return; 1481 return;
1181 1482
1483 if (w->reschedule_cb)
1484 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1485 else if (w->interval)
1486 {
1182 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1487 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1183
1184 /* this formula differs from the one in periodic_reify because we do not always round up */ 1488 /* this formula differs from the one in periodic_reify because we do not always round up */
1185 if (w->interval)
1186 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1489 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1490 }
1187 1491
1188 ev_start (EV_A_ (W)w, ++periodiccnt); 1492 ev_start (EV_A_ (W)w, ++periodiccnt);
1189 array_needsize (periodics, periodicmax, periodiccnt, ); 1493 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1190 periodics [periodiccnt - 1] = w; 1494 periodics [periodiccnt - 1] = w;
1191 upheap ((WT *)periodics, periodiccnt - 1); 1495 upheap ((WT *)periodics, periodiccnt - 1);
1192 1496
1193 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1497 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1194} 1498}
1195 1499
1196void 1500void
1197ev_periodic_stop (EV_P_ struct ev_periodic *w) 1501ev_periodic_stop (EV_P_ struct ev_periodic *w)
1198{ 1502{
1199 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1200 if (!ev_is_active (w)) 1504 if (expect_false (!ev_is_active (w)))
1201 return; 1505 return;
1202 1506
1203 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1507 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1204 1508
1205 if (((W)w)->active < periodiccnt--) 1509 if (expect_true (((W)w)->active < periodiccnt--))
1206 { 1510 {
1207 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1511 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1208 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1512 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1209 } 1513 }
1210 1514
1211 ev_stop (EV_A_ (W)w); 1515 ev_stop (EV_A_ (W)w);
1212} 1516}
1213 1517
1214void 1518void
1519ev_periodic_again (EV_P_ struct ev_periodic *w)
1520{
1521 /* TODO: use adjustheap and recalculation */
1522 ev_periodic_stop (EV_A_ w);
1523 ev_periodic_start (EV_A_ w);
1524}
1525#endif
1526
1527void
1215ev_idle_start (EV_P_ struct ev_idle *w) 1528ev_idle_start (EV_P_ struct ev_idle *w)
1216{ 1529{
1217 if (ev_is_active (w)) 1530 if (expect_false (ev_is_active (w)))
1218 return; 1531 return;
1219 1532
1220 ev_start (EV_A_ (W)w, ++idlecnt); 1533 ev_start (EV_A_ (W)w, ++idlecnt);
1221 array_needsize (idles, idlemax, idlecnt, ); 1534 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1222 idles [idlecnt - 1] = w; 1535 idles [idlecnt - 1] = w;
1223} 1536}
1224 1537
1225void 1538void
1226ev_idle_stop (EV_P_ struct ev_idle *w) 1539ev_idle_stop (EV_P_ struct ev_idle *w)
1227{ 1540{
1228 ev_clear_pending (EV_A_ (W)w); 1541 ev_clear_pending (EV_A_ (W)w);
1229 if (ev_is_active (w)) 1542 if (expect_false (!ev_is_active (w)))
1230 return; 1543 return;
1231 1544
1232 idles [((W)w)->active - 1] = idles [--idlecnt]; 1545 idles [((W)w)->active - 1] = idles [--idlecnt];
1233 ev_stop (EV_A_ (W)w); 1546 ev_stop (EV_A_ (W)w);
1234} 1547}
1235 1548
1236void 1549void
1237ev_prepare_start (EV_P_ struct ev_prepare *w) 1550ev_prepare_start (EV_P_ struct ev_prepare *w)
1238{ 1551{
1239 if (ev_is_active (w)) 1552 if (expect_false (ev_is_active (w)))
1240 return; 1553 return;
1241 1554
1242 ev_start (EV_A_ (W)w, ++preparecnt); 1555 ev_start (EV_A_ (W)w, ++preparecnt);
1243 array_needsize (prepares, preparemax, preparecnt, ); 1556 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1244 prepares [preparecnt - 1] = w; 1557 prepares [preparecnt - 1] = w;
1245} 1558}
1246 1559
1247void 1560void
1248ev_prepare_stop (EV_P_ struct ev_prepare *w) 1561ev_prepare_stop (EV_P_ struct ev_prepare *w)
1249{ 1562{
1250 ev_clear_pending (EV_A_ (W)w); 1563 ev_clear_pending (EV_A_ (W)w);
1251 if (ev_is_active (w)) 1564 if (expect_false (!ev_is_active (w)))
1252 return; 1565 return;
1253 1566
1254 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1567 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1255 ev_stop (EV_A_ (W)w); 1568 ev_stop (EV_A_ (W)w);
1256} 1569}
1257 1570
1258void 1571void
1259ev_check_start (EV_P_ struct ev_check *w) 1572ev_check_start (EV_P_ struct ev_check *w)
1260{ 1573{
1261 if (ev_is_active (w)) 1574 if (expect_false (ev_is_active (w)))
1262 return; 1575 return;
1263 1576
1264 ev_start (EV_A_ (W)w, ++checkcnt); 1577 ev_start (EV_A_ (W)w, ++checkcnt);
1265 array_needsize (checks, checkmax, checkcnt, ); 1578 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1266 checks [checkcnt - 1] = w; 1579 checks [checkcnt - 1] = w;
1267} 1580}
1268 1581
1269void 1582void
1270ev_check_stop (EV_P_ struct ev_check *w) 1583ev_check_stop (EV_P_ struct ev_check *w)
1271{ 1584{
1272 ev_clear_pending (EV_A_ (W)w); 1585 ev_clear_pending (EV_A_ (W)w);
1273 if (ev_is_active (w)) 1586 if (expect_false (!ev_is_active (w)))
1274 return; 1587 return;
1275 1588
1276 checks [((W)w)->active - 1] = checks [--checkcnt]; 1589 checks [((W)w)->active - 1] = checks [--checkcnt];
1277 ev_stop (EV_A_ (W)w); 1590 ev_stop (EV_A_ (W)w);
1278} 1591}
1283 1596
1284void 1597void
1285ev_signal_start (EV_P_ struct ev_signal *w) 1598ev_signal_start (EV_P_ struct ev_signal *w)
1286{ 1599{
1287#if EV_MULTIPLICITY 1600#if EV_MULTIPLICITY
1288 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1601 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1289#endif 1602#endif
1290 if (ev_is_active (w)) 1603 if (expect_false (ev_is_active (w)))
1291 return; 1604 return;
1292 1605
1293 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1606 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1294 1607
1295 ev_start (EV_A_ (W)w, 1); 1608 ev_start (EV_A_ (W)w, 1);
1296 array_needsize (signals, signalmax, w->signum, signals_init); 1609 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1297 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1610 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1298 1611
1299 if (!((WL)w)->next) 1612 if (!((WL)w)->next)
1300 { 1613 {
1614#if _WIN32
1615 signal (w->signum, sighandler);
1616#else
1301 struct sigaction sa; 1617 struct sigaction sa;
1302 sa.sa_handler = sighandler; 1618 sa.sa_handler = sighandler;
1303 sigfillset (&sa.sa_mask); 1619 sigfillset (&sa.sa_mask);
1304 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1620 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1305 sigaction (w->signum, &sa, 0); 1621 sigaction (w->signum, &sa, 0);
1622#endif
1306 } 1623 }
1307} 1624}
1308 1625
1309void 1626void
1310ev_signal_stop (EV_P_ struct ev_signal *w) 1627ev_signal_stop (EV_P_ struct ev_signal *w)
1311{ 1628{
1312 ev_clear_pending (EV_A_ (W)w); 1629 ev_clear_pending (EV_A_ (W)w);
1313 if (!ev_is_active (w)) 1630 if (expect_false (!ev_is_active (w)))
1314 return; 1631 return;
1315 1632
1316 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1633 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1317 ev_stop (EV_A_ (W)w); 1634 ev_stop (EV_A_ (W)w);
1318 1635
1322 1639
1323void 1640void
1324ev_child_start (EV_P_ struct ev_child *w) 1641ev_child_start (EV_P_ struct ev_child *w)
1325{ 1642{
1326#if EV_MULTIPLICITY 1643#if EV_MULTIPLICITY
1327 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1644 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1328#endif 1645#endif
1329 if (ev_is_active (w)) 1646 if (expect_false (ev_is_active (w)))
1330 return; 1647 return;
1331 1648
1332 ev_start (EV_A_ (W)w, 1); 1649 ev_start (EV_A_ (W)w, 1);
1333 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1650 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1334} 1651}
1335 1652
1336void 1653void
1337ev_child_stop (EV_P_ struct ev_child *w) 1654ev_child_stop (EV_P_ struct ev_child *w)
1338{ 1655{
1339 ev_clear_pending (EV_A_ (W)w); 1656 ev_clear_pending (EV_A_ (W)w);
1340 if (ev_is_active (w)) 1657 if (expect_false (!ev_is_active (w)))
1341 return; 1658 return;
1342 1659
1343 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1660 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1344 ev_stop (EV_A_ (W)w); 1661 ev_stop (EV_A_ (W)w);
1345} 1662}
1360 void (*cb)(int revents, void *arg) = once->cb; 1677 void (*cb)(int revents, void *arg) = once->cb;
1361 void *arg = once->arg; 1678 void *arg = once->arg;
1362 1679
1363 ev_io_stop (EV_A_ &once->io); 1680 ev_io_stop (EV_A_ &once->io);
1364 ev_timer_stop (EV_A_ &once->to); 1681 ev_timer_stop (EV_A_ &once->to);
1365 free (once); 1682 ev_free (once);
1366 1683
1367 cb (revents, arg); 1684 cb (revents, arg);
1368} 1685}
1369 1686
1370static void 1687static void
1380} 1697}
1381 1698
1382void 1699void
1383ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1700ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1384{ 1701{
1385 struct ev_once *once = malloc (sizeof (struct ev_once)); 1702 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1386 1703
1387 if (!once) 1704 if (expect_false (!once))
1705 {
1388 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1706 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1389 else 1707 return;
1390 { 1708 }
1709
1391 once->cb = cb; 1710 once->cb = cb;
1392 once->arg = arg; 1711 once->arg = arg;
1393 1712
1394 ev_watcher_init (&once->io, once_cb_io); 1713 ev_init (&once->io, once_cb_io);
1395 if (fd >= 0) 1714 if (fd >= 0)
1396 { 1715 {
1397 ev_io_set (&once->io, fd, events); 1716 ev_io_set (&once->io, fd, events);
1398 ev_io_start (EV_A_ &once->io); 1717 ev_io_start (EV_A_ &once->io);
1399 } 1718 }
1400 1719
1401 ev_watcher_init (&once->to, once_cb_to); 1720 ev_init (&once->to, once_cb_to);
1402 if (timeout >= 0.) 1721 if (timeout >= 0.)
1403 { 1722 {
1404 ev_timer_set (&once->to, timeout, 0.); 1723 ev_timer_set (&once->to, timeout, 0.);
1405 ev_timer_start (EV_A_ &once->to); 1724 ev_timer_start (EV_A_ &once->to);
1406 }
1407 } 1725 }
1408} 1726}
1409 1727
1728#ifdef __cplusplus
1729}
1730#endif
1731

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines