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

Comparing libev/ev.c (file contents):
Revision 1.67 by root, Mon Nov 5 16:42:15 2007 UTC vs.
Revision 1.129 by root, Fri Nov 23 05:00:44 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines