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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines