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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines