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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines