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.133 by root, Fri Nov 23 11:32:22 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines