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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines