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.132 by root, Fri Nov 23 10:36:30 2007 UTC

26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
32# include "config.h" 37# include "config.h"
33 38
34# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif
43# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif
46# else
47# ifndef EV_USE_MONOTONIC
48# define EV_USE_MONOTONIC 0
49# endif
50# ifndef EV_USE_REALTIME
51# define EV_USE_REALTIME 0
52# endif
37# endif 53# endif
38 54
55# ifndef EV_USE_SELECT
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 56# if HAVE_SELECT && HAVE_SYS_SELECT_H
40# define EV_USE_SELECT 1 57# define EV_USE_SELECT 1
58# else
59# define EV_USE_SELECT 0
60# endif
41# endif 61# endif
42 62
63# ifndef EV_USE_POLL
43# if HAVE_POLL && HAVE_POLL_H 64# if HAVE_POLL && HAVE_POLL_H
44# define EV_USE_POLL 1 65# define EV_USE_POLL 1
66# else
67# define EV_USE_POLL 0
68# endif
45# endif 69# endif
46 70
71# ifndef EV_USE_EPOLL
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 72# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1 73# define EV_USE_EPOLL 1
74# else
75# define EV_USE_EPOLL 0
76# endif
49# endif 77# endif
50 78
79# ifndef EV_USE_KQUEUE
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 80# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1 81# define EV_USE_KQUEUE 1
82# else
83# define EV_USE_KQUEUE 0
84# endif
85# endif
86
87# ifndef EV_USE_PORT
88# if HAVE_PORT_H && HAVE_PORT_CREATE
89# define EV_USE_PORT 1
90# else
91# define EV_USE_PORT 0
92# endif
53# endif 93# endif
54 94
55#endif 95#endif
56 96
57#include <math.h> 97#include <math.h>
58#include <stdlib.h> 98#include <stdlib.h>
59#include <unistd.h>
60#include <fcntl.h> 99#include <fcntl.h>
61#include <signal.h>
62#include <stddef.h> 100#include <stddef.h>
63 101
64#include <stdio.h> 102#include <stdio.h>
65 103
66#include <assert.h> 104#include <assert.h>
67#include <errno.h> 105#include <errno.h>
68#include <sys/types.h> 106#include <sys/types.h>
107#include <time.h>
108
109#include <signal.h>
110
69#ifndef WIN32 111#ifndef _WIN32
112# include <unistd.h>
113# include <sys/time.h>
70# include <sys/wait.h> 114# include <sys/wait.h>
115#else
116# define WIN32_LEAN_AND_MEAN
117# include <windows.h>
118# ifndef EV_SELECT_IS_WINSOCKET
119# define EV_SELECT_IS_WINSOCKET 1
71#endif 120# endif
72#include <sys/time.h> 121#endif
73#include <time.h>
74 122
75/**/ 123/**/
76 124
77#ifndef EV_USE_MONOTONIC 125#ifndef EV_USE_MONOTONIC
78# define EV_USE_MONOTONIC 1 126# define EV_USE_MONOTONIC 0
127#endif
128
129#ifndef EV_USE_REALTIME
130# define EV_USE_REALTIME 0
79#endif 131#endif
80 132
81#ifndef EV_USE_SELECT 133#ifndef EV_USE_SELECT
82# define EV_USE_SELECT 1 134# define EV_USE_SELECT 1
83#endif 135#endif
84 136
85#ifndef EV_USE_POLL 137#ifndef EV_USE_POLL
86# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 138# ifdef _WIN32
139# define EV_USE_POLL 0
140# else
141# define EV_USE_POLL 1
142# endif
87#endif 143#endif
88 144
89#ifndef EV_USE_EPOLL 145#ifndef EV_USE_EPOLL
90# define EV_USE_EPOLL 0 146# define EV_USE_EPOLL 0
91#endif 147#endif
92 148
93#ifndef EV_USE_KQUEUE 149#ifndef EV_USE_KQUEUE
94# define EV_USE_KQUEUE 0 150# define EV_USE_KQUEUE 0
95#endif 151#endif
96 152
97#ifndef EV_USE_WIN32
98# ifdef WIN32
99# define EV_USE_WIN32 1
100# else
101# define EV_USE_WIN32 0
102# endif
103#endif
104
105#ifndef EV_USE_REALTIME 153#ifndef EV_USE_PORT
106# define EV_USE_REALTIME 1 154# define EV_USE_PORT 0
107#endif 155#endif
108 156
109/**/ 157/**/
110 158
111#ifndef CLOCK_MONOTONIC 159#ifndef CLOCK_MONOTONIC
116#ifndef CLOCK_REALTIME 164#ifndef CLOCK_REALTIME
117# undef EV_USE_REALTIME 165# undef EV_USE_REALTIME
118# define EV_USE_REALTIME 0 166# define EV_USE_REALTIME 0
119#endif 167#endif
120 168
169#if EV_SELECT_IS_WINSOCKET
170# include <winsock.h>
171#endif
172
121/**/ 173/**/
122 174
123#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 175#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
124#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 176#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
125#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 177#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
126/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 178/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
127 179
180#ifdef EV_H
181# include EV_H
182#else
128#include "ev.h" 183# include "ev.h"
184#endif
129 185
130#if __GNUC__ >= 3 186#if __GNUC__ >= 3
131# define expect(expr,value) __builtin_expect ((expr),(value)) 187# define expect(expr,value) __builtin_expect ((expr),(value))
132# define inline inline 188# define inline static inline
133#else 189#else
134# define expect(expr,value) (expr) 190# define expect(expr,value) (expr)
135# define inline static 191# define inline static
136#endif 192#endif
137 193
139#define expect_true(expr) expect ((expr) != 0, 1) 195#define expect_true(expr) expect ((expr) != 0, 1)
140 196
141#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 197#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
142#define ABSPRI(w) ((w)->priority - EV_MINPRI) 198#define ABSPRI(w) ((w)->priority - EV_MINPRI)
143 199
200#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
201#define EMPTY2(a,b) /* used to suppress some warnings */
202
144typedef struct ev_watcher *W; 203typedef struct ev_watcher *W;
145typedef struct ev_watcher_list *WL; 204typedef struct ev_watcher_list *WL;
146typedef struct ev_watcher_time *WT; 205typedef struct ev_watcher_time *WT;
147 206
148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 207static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
149 208
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 */
732 /* we need to do it this way so that the callback gets called before we continue */
604 event (EV_A_ (W)sw, EV_SIGNAL); 733 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
605 734
606 child_reap (EV_A_ sw, pid, pid, status); 735 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 */ 736 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
608 } 737 }
609} 738}
610 739
611#endif 740#endif
612 741
613/*****************************************************************************/ 742/*****************************************************************************/
614 743
744#if EV_USE_PORT
745# include "ev_port.c"
746#endif
615#if EV_USE_KQUEUE 747#if EV_USE_KQUEUE
616# include "ev_kqueue.c" 748# include "ev_kqueue.c"
617#endif 749#endif
618#if EV_USE_EPOLL 750#if EV_USE_EPOLL
619# include "ev_epoll.c" 751# include "ev_epoll.c"
639 771
640/* return true if we are running with elevated privileges and should ignore env variables */ 772/* return true if we are running with elevated privileges and should ignore env variables */
641static int 773static int
642enable_secure (void) 774enable_secure (void)
643{ 775{
644#ifdef WIN32 776#ifdef _WIN32
645 return 0; 777 return 0;
646#else 778#else
647 return getuid () != geteuid () 779 return getuid () != geteuid ()
648 || getgid () != getegid (); 780 || getgid () != getegid ();
649#endif 781#endif
650} 782}
651 783
652int 784unsigned int
653ev_method (EV_P) 785ev_supported_backends (void)
654{ 786{
655 return method; 787 unsigned int flags = 0;
656}
657 788
658static void 789 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
659loop_init (EV_P_ int methods) 790 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
791 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
792 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
793 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
794
795 return flags;
796}
797
798unsigned int
799ev_recommended_backends (void)
660{ 800{
661 if (!method) 801 unsigned int flags = ev_supported_backends ();
802
803#ifndef __NetBSD__
804 /* kqueue is borked on everything but netbsd apparently */
805 /* it usually doesn't work correctly on anything but sockets and pipes */
806 flags &= ~EVBACKEND_KQUEUE;
807#endif
808#ifdef __APPLE__
809 // flags &= ~EVBACKEND_KQUEUE; for documentation
810 flags &= ~EVBACKEND_POLL;
811#endif
812
813 return flags;
814}
815
816unsigned int
817ev_backend (EV_P)
818{
819 return backend;
820}
821
822static void
823loop_init (EV_P_ unsigned int flags)
824{
825 if (!backend)
662 { 826 {
663#if EV_USE_MONOTONIC 827#if EV_USE_MONOTONIC
664 { 828 {
665 struct timespec ts; 829 struct timespec ts;
666 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 830 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
667 have_monotonic = 1; 831 have_monotonic = 1;
668 } 832 }
669#endif 833#endif
670 834
671 rt_now = ev_time (); 835 ev_rt_now = ev_time ();
672 mn_now = get_clock (); 836 mn_now = get_clock ();
673 now_floor = mn_now; 837 now_floor = mn_now;
674 rtmn_diff = rt_now - mn_now; 838 rtmn_diff = ev_rt_now - mn_now;
675 839
676 if (methods == EVMETHOD_AUTO) 840 if (!(flags & EVFLAG_NOENV)
677 if (!enable_secure () && getenv ("LIBEV_METHODS")) 841 && !enable_secure ()
842 && getenv ("LIBEV_FLAGS"))
678 methods = atoi (getenv ("LIBEV_METHODS")); 843 flags = atoi (getenv ("LIBEV_FLAGS"));
679 else
680 methods = EVMETHOD_ANY;
681 844
682 method = 0; 845 if (!(flags & 0x0000ffffUL))
683#if EV_USE_WIN32 846 flags |= ev_recommended_backends ();
684 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 847
848 backend = 0;
849#if EV_USE_PORT
850 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
685#endif 851#endif
686#if EV_USE_KQUEUE 852#if EV_USE_KQUEUE
687 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 853 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
688#endif 854#endif
689#if EV_USE_EPOLL 855#if EV_USE_EPOLL
690 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 856 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
691#endif 857#endif
692#if EV_USE_POLL 858#if EV_USE_POLL
693 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 859 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
694#endif 860#endif
695#if EV_USE_SELECT 861#if EV_USE_SELECT
696 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 862 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
697#endif 863#endif
698 }
699}
700 864
701void 865 ev_init (&sigev, sigcb);
866 ev_set_priority (&sigev, EV_MAXPRI);
867 }
868}
869
870static void
702loop_destroy (EV_P) 871loop_destroy (EV_P)
703{ 872{
704 int i; 873 int i;
705 874
706#if EV_USE_WIN32 875#if EV_USE_PORT
707 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 876 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
708#endif 877#endif
709#if EV_USE_KQUEUE 878#if EV_USE_KQUEUE
710 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 879 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
711#endif 880#endif
712#if EV_USE_EPOLL 881#if EV_USE_EPOLL
713 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 882 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
714#endif 883#endif
715#if EV_USE_POLL 884#if EV_USE_POLL
716 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 885 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
717#endif 886#endif
718#if EV_USE_SELECT 887#if EV_USE_SELECT
719 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 888 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
720#endif 889#endif
721 890
722 for (i = NUMPRI; i--; ) 891 for (i = NUMPRI; i--; )
723 array_free (pending, [i]); 892 array_free (pending, [i]);
724 893
894 /* have to use the microsoft-never-gets-it-right macro */
725 array_free (fdchange, ); 895 array_free (fdchange, EMPTY0);
726 array_free (timer, ); 896 array_free (timer, EMPTY0);
897#if EV_PERIODICS
727 array_free (periodic, ); 898 array_free (periodic, EMPTY0);
899#endif
728 array_free (idle, ); 900 array_free (idle, EMPTY0);
729 array_free (prepare, ); 901 array_free (prepare, EMPTY0);
730 array_free (check, ); 902 array_free (check, EMPTY0);
731 903
732 method = 0; 904 backend = 0;
733 /*TODO*/
734} 905}
735 906
736void 907static void
737loop_fork (EV_P) 908loop_fork (EV_P)
738{ 909{
739 /*TODO*/ 910#if EV_USE_PORT
911 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
912#endif
913#if EV_USE_KQUEUE
914 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
915#endif
740#if EV_USE_EPOLL 916#if EV_USE_EPOLL
741 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 917 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
742#endif 918#endif
743#if EV_USE_KQUEUE 919
744 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 920 if (ev_is_active (&sigev))
745#endif 921 {
922 /* default loop */
923
924 ev_ref (EV_A);
925 ev_io_stop (EV_A_ &sigev);
926 close (sigpipe [0]);
927 close (sigpipe [1]);
928
929 while (pipe (sigpipe))
930 syserr ("(libev) error creating pipe");
931
932 siginit (EV_A);
933 }
934
935 postfork = 0;
746} 936}
747 937
748#if EV_MULTIPLICITY 938#if EV_MULTIPLICITY
749struct ev_loop * 939struct ev_loop *
750ev_loop_new (int methods) 940ev_loop_new (unsigned int flags)
751{ 941{
752 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 942 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
753 943
754 memset (loop, 0, sizeof (struct ev_loop)); 944 memset (loop, 0, sizeof (struct ev_loop));
755 945
756 loop_init (EV_A_ methods); 946 loop_init (EV_A_ flags);
757 947
758 if (ev_method (EV_A)) 948 if (ev_backend (EV_A))
759 return loop; 949 return loop;
760 950
761 return 0; 951 return 0;
762} 952}
763 953
769} 959}
770 960
771void 961void
772ev_loop_fork (EV_P) 962ev_loop_fork (EV_P)
773{ 963{
774 loop_fork (EV_A); 964 postfork = 1;
775} 965}
776 966
777#endif 967#endif
778 968
779#if EV_MULTIPLICITY 969#if EV_MULTIPLICITY
780struct ev_loop default_loop_struct;
781static struct ev_loop *default_loop;
782
783struct ev_loop * 970struct ev_loop *
971ev_default_loop_init (unsigned int flags)
784#else 972#else
785static int default_loop;
786
787int 973int
974ev_default_loop (unsigned int flags)
788#endif 975#endif
789ev_default_loop (int methods)
790{ 976{
791 if (sigpipe [0] == sigpipe [1]) 977 if (sigpipe [0] == sigpipe [1])
792 if (pipe (sigpipe)) 978 if (pipe (sigpipe))
793 return 0; 979 return 0;
794 980
795 if (!default_loop) 981 if (!ev_default_loop_ptr)
796 { 982 {
797#if EV_MULTIPLICITY 983#if EV_MULTIPLICITY
798 struct ev_loop *loop = default_loop = &default_loop_struct; 984 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
799#else 985#else
800 default_loop = 1; 986 ev_default_loop_ptr = 1;
801#endif 987#endif
802 988
803 loop_init (EV_A_ methods); 989 loop_init (EV_A_ flags);
804 990
805 if (ev_method (EV_A)) 991 if (ev_backend (EV_A))
806 { 992 {
807 ev_watcher_init (&sigev, sigcb);
808 ev_set_priority (&sigev, EV_MAXPRI);
809 siginit (EV_A); 993 siginit (EV_A);
810 994
811#ifndef WIN32 995#ifndef _WIN32
812 ev_signal_init (&childev, childcb, SIGCHLD); 996 ev_signal_init (&childev, childcb, SIGCHLD);
813 ev_set_priority (&childev, EV_MAXPRI); 997 ev_set_priority (&childev, EV_MAXPRI);
814 ev_signal_start (EV_A_ &childev); 998 ev_signal_start (EV_A_ &childev);
815 ev_unref (EV_A); /* child watcher should not keep loop alive */ 999 ev_unref (EV_A); /* child watcher should not keep loop alive */
816#endif 1000#endif
817 } 1001 }
818 else 1002 else
819 default_loop = 0; 1003 ev_default_loop_ptr = 0;
820 } 1004 }
821 1005
822 return default_loop; 1006 return ev_default_loop_ptr;
823} 1007}
824 1008
825void 1009void
826ev_default_destroy (void) 1010ev_default_destroy (void)
827{ 1011{
828#if EV_MULTIPLICITY 1012#if EV_MULTIPLICITY
829 struct ev_loop *loop = default_loop; 1013 struct ev_loop *loop = ev_default_loop_ptr;
830#endif 1014#endif
831 1015
1016#ifndef _WIN32
832 ev_ref (EV_A); /* child watcher */ 1017 ev_ref (EV_A); /* child watcher */
833 ev_signal_stop (EV_A_ &childev); 1018 ev_signal_stop (EV_A_ &childev);
1019#endif
834 1020
835 ev_ref (EV_A); /* signal watcher */ 1021 ev_ref (EV_A); /* signal watcher */
836 ev_io_stop (EV_A_ &sigev); 1022 ev_io_stop (EV_A_ &sigev);
837 1023
838 close (sigpipe [0]); sigpipe [0] = 0; 1024 close (sigpipe [0]); sigpipe [0] = 0;
843 1029
844void 1030void
845ev_default_fork (void) 1031ev_default_fork (void)
846{ 1032{
847#if EV_MULTIPLICITY 1033#if EV_MULTIPLICITY
848 struct ev_loop *loop = default_loop; 1034 struct ev_loop *loop = ev_default_loop_ptr;
849#endif 1035#endif
850 1036
851 loop_fork (EV_A); 1037 if (backend)
852 1038 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} 1039}
861 1040
862/*****************************************************************************/ 1041/*****************************************************************************/
863 1042
864static void 1043static int
1044any_pending (EV_P)
1045{
1046 int pri;
1047
1048 for (pri = NUMPRI; pri--; )
1049 if (pendingcnt [pri])
1050 return 1;
1051
1052 return 0;
1053}
1054
1055inline void
865call_pending (EV_P) 1056call_pending (EV_P)
866{ 1057{
867 int pri; 1058 int pri;
868 1059
869 for (pri = NUMPRI; pri--; ) 1060 for (pri = NUMPRI; pri--; )
870 while (pendingcnt [pri]) 1061 while (pendingcnt [pri])
871 { 1062 {
872 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1063 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
873 1064
874 if (p->w) 1065 if (expect_true (p->w))
875 { 1066 {
876 p->w->pending = 0; 1067 p->w->pending = 0;
877 p->w->cb (EV_A_ p->w, p->events); 1068 EV_CB_INVOKE (p->w, p->events);
878 } 1069 }
879 } 1070 }
880} 1071}
881 1072
882static void 1073inline void
883timers_reify (EV_P) 1074timers_reify (EV_P)
884{ 1075{
885 while (timercnt && ((WT)timers [0])->at <= mn_now) 1076 while (timercnt && ((WT)timers [0])->at <= mn_now)
886 { 1077 {
887 struct ev_timer *w = timers [0]; 1078 struct ev_timer *w = timers [0];
890 1081
891 /* first reschedule or stop timer */ 1082 /* first reschedule or stop timer */
892 if (w->repeat) 1083 if (w->repeat)
893 { 1084 {
894 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1085 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1086
895 ((WT)w)->at = mn_now + w->repeat; 1087 ((WT)w)->at += w->repeat;
1088 if (((WT)w)->at < mn_now)
1089 ((WT)w)->at = mn_now;
1090
896 downheap ((WT *)timers, timercnt, 0); 1091 downheap ((WT *)timers, timercnt, 0);
897 } 1092 }
898 else 1093 else
899 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1094 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
900 1095
901 event (EV_A_ (W)w, EV_TIMEOUT); 1096 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
902 } 1097 }
903} 1098}
904 1099
905static void 1100#if EV_PERIODICS
1101inline void
906periodics_reify (EV_P) 1102periodics_reify (EV_P)
907{ 1103{
908 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1104 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
909 { 1105 {
910 struct ev_periodic *w = periodics [0]; 1106 struct ev_periodic *w = periodics [0];
911 1107
912 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1108 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
913 1109
914 /* first reschedule or stop timer */ 1110 /* first reschedule or stop timer */
915 if (w->interval) 1111 if (w->reschedule_cb)
916 { 1112 {
1113 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1114 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1115 downheap ((WT *)periodics, periodiccnt, 0);
1116 }
1117 else if (w->interval)
1118 {
917 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1119 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
918 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1120 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
919 downheap ((WT *)periodics, periodiccnt, 0); 1121 downheap ((WT *)periodics, periodiccnt, 0);
920 } 1122 }
921 else 1123 else
922 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1124 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
923 1125
924 event (EV_A_ (W)w, EV_PERIODIC); 1126 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
925 } 1127 }
926} 1128}
927 1129
928static void 1130static void
929periodics_reschedule (EV_P) 1131periodics_reschedule (EV_P)
933 /* adjust periodics after time jump */ 1135 /* adjust periodics after time jump */
934 for (i = 0; i < periodiccnt; ++i) 1136 for (i = 0; i < periodiccnt; ++i)
935 { 1137 {
936 struct ev_periodic *w = periodics [i]; 1138 struct ev_periodic *w = periodics [i];
937 1139
1140 if (w->reschedule_cb)
1141 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
938 if (w->interval) 1142 else if (w->interval)
939 {
940 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1143 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
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 } 1144 }
1145
1146 /* now rebuild the heap */
1147 for (i = periodiccnt >> 1; i--; )
1148 downheap ((WT *)periodics, periodiccnt, i);
951} 1149}
1150#endif
952 1151
953inline int 1152inline int
954time_update_monotonic (EV_P) 1153time_update_monotonic (EV_P)
955{ 1154{
956 mn_now = get_clock (); 1155 mn_now = get_clock ();
957 1156
958 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1157 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
959 { 1158 {
960 rt_now = rtmn_diff + mn_now; 1159 ev_rt_now = rtmn_diff + mn_now;
961 return 0; 1160 return 0;
962 } 1161 }
963 else 1162 else
964 { 1163 {
965 now_floor = mn_now; 1164 now_floor = mn_now;
966 rt_now = ev_time (); 1165 ev_rt_now = ev_time ();
967 return 1; 1166 return 1;
968 } 1167 }
969} 1168}
970 1169
971static void 1170inline void
972time_update (EV_P) 1171time_update (EV_P)
973{ 1172{
974 int i; 1173 int i;
975 1174
976#if EV_USE_MONOTONIC 1175#if EV_USE_MONOTONIC
980 { 1179 {
981 ev_tstamp odiff = rtmn_diff; 1180 ev_tstamp odiff = rtmn_diff;
982 1181
983 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1182 for (i = 4; --i; ) /* loop a few times, before making important decisions */
984 { 1183 {
985 rtmn_diff = rt_now - mn_now; 1184 rtmn_diff = ev_rt_now - mn_now;
986 1185
987 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1186 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
988 return; /* all is well */ 1187 return; /* all is well */
989 1188
990 rt_now = ev_time (); 1189 ev_rt_now = ev_time ();
991 mn_now = get_clock (); 1190 mn_now = get_clock ();
992 now_floor = mn_now; 1191 now_floor = mn_now;
993 } 1192 }
994 1193
1194# if EV_PERIODICS
995 periodics_reschedule (EV_A); 1195 periodics_reschedule (EV_A);
1196# endif
996 /* no timer adjustment, as the monotonic clock doesn't jump */ 1197 /* no timer adjustment, as the monotonic clock doesn't jump */
997 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1198 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
998 } 1199 }
999 } 1200 }
1000 else 1201 else
1001#endif 1202#endif
1002 { 1203 {
1003 rt_now = ev_time (); 1204 ev_rt_now = ev_time ();
1004 1205
1005 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1206 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1006 { 1207 {
1208#if EV_PERIODICS
1007 periodics_reschedule (EV_A); 1209 periodics_reschedule (EV_A);
1210#endif
1008 1211
1009 /* adjust timers. this is easy, as the offset is the same for all */ 1212 /* adjust timers. this is easy, as the offset is the same for all */
1010 for (i = 0; i < timercnt; ++i) 1213 for (i = 0; i < timercnt; ++i)
1011 ((WT)timers [i])->at += rt_now - mn_now; 1214 ((WT)timers [i])->at += ev_rt_now - mn_now;
1012 } 1215 }
1013 1216
1014 mn_now = rt_now; 1217 mn_now = ev_rt_now;
1015 } 1218 }
1016} 1219}
1017 1220
1018void 1221void
1019ev_ref (EV_P) 1222ev_ref (EV_P)
1033ev_loop (EV_P_ int flags) 1236ev_loop (EV_P_ int flags)
1034{ 1237{
1035 double block; 1238 double block;
1036 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1239 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1037 1240
1038 do 1241 while (activecnt)
1039 { 1242 {
1040 /* queue check watchers (and execute them) */ 1243 /* queue check watchers (and execute them) */
1041 if (expect_false (preparecnt)) 1244 if (expect_false (preparecnt))
1042 { 1245 {
1043 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1246 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1044 call_pending (EV_A); 1247 call_pending (EV_A);
1045 } 1248 }
1046 1249
1250 /* we might have forked, so reify kernel state if necessary */
1251 if (expect_false (postfork))
1252 loop_fork (EV_A);
1253
1047 /* update fd-related kernel structures */ 1254 /* update fd-related kernel structures */
1048 fd_reify (EV_A); 1255 fd_reify (EV_A);
1049 1256
1050 /* calculate blocking time */ 1257 /* calculate blocking time */
1051 1258
1052 /* we only need this for !monotonic clockor timers, but as we basically 1259 /* we only need this for !monotonic clock or timers, but as we basically
1053 always have timers, we just calculate it always */ 1260 always have timers, we just calculate it always */
1054#if EV_USE_MONOTONIC 1261#if EV_USE_MONOTONIC
1055 if (expect_true (have_monotonic)) 1262 if (expect_true (have_monotonic))
1056 time_update_monotonic (EV_A); 1263 time_update_monotonic (EV_A);
1057 else 1264 else
1058#endif 1265#endif
1059 { 1266 {
1060 rt_now = ev_time (); 1267 ev_rt_now = ev_time ();
1061 mn_now = rt_now; 1268 mn_now = ev_rt_now;
1062 } 1269 }
1063 1270
1064 if (flags & EVLOOP_NONBLOCK || idlecnt) 1271 if (flags & EVLOOP_NONBLOCK || idlecnt)
1065 block = 0.; 1272 block = 0.;
1066 else 1273 else
1067 { 1274 {
1068 block = MAX_BLOCKTIME; 1275 block = MAX_BLOCKTIME;
1069 1276
1070 if (timercnt) 1277 if (timercnt)
1071 { 1278 {
1072 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1279 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1073 if (block > to) block = to; 1280 if (block > to) block = to;
1074 } 1281 }
1075 1282
1283#if EV_PERIODICS
1076 if (periodiccnt) 1284 if (periodiccnt)
1077 { 1285 {
1078 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1286 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1079 if (block > to) block = to; 1287 if (block > to) block = to;
1080 } 1288 }
1289#endif
1081 1290
1082 if (block < 0.) block = 0.; 1291 if (expect_false (block < 0.)) block = 0.;
1083 } 1292 }
1084 1293
1085 method_poll (EV_A_ block); 1294 backend_poll (EV_A_ block);
1086 1295
1087 /* update rt_now, do magic */ 1296 /* update ev_rt_now, do magic */
1088 time_update (EV_A); 1297 time_update (EV_A);
1089 1298
1090 /* queue pending timers and reschedule them */ 1299 /* queue pending timers and reschedule them */
1091 timers_reify (EV_A); /* relative timers called last */ 1300 timers_reify (EV_A); /* relative timers called last */
1301#if EV_PERIODICS
1092 periodics_reify (EV_A); /* absolute timers called first */ 1302 periodics_reify (EV_A); /* absolute timers called first */
1303#endif
1093 1304
1094 /* queue idle watchers unless io or timers are pending */ 1305 /* queue idle watchers unless io or timers are pending */
1095 if (!pendingcnt) 1306 if (idlecnt && !any_pending (EV_A))
1096 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1307 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1097 1308
1098 /* queue check watchers, to be executed first */ 1309 /* queue check watchers, to be executed first */
1099 if (checkcnt) 1310 if (expect_false (checkcnt))
1100 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1311 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1101 1312
1102 call_pending (EV_A); 1313 call_pending (EV_A);
1314
1315 if (expect_false (loop_done))
1316 break;
1103 } 1317 }
1104 while (activecnt && !loop_done);
1105 1318
1106 if (loop_done != 2) 1319 if (loop_done != 2)
1107 loop_done = 0; 1320 loop_done = 0;
1108} 1321}
1109 1322
1169void 1382void
1170ev_io_start (EV_P_ struct ev_io *w) 1383ev_io_start (EV_P_ struct ev_io *w)
1171{ 1384{
1172 int fd = w->fd; 1385 int fd = w->fd;
1173 1386
1174 if (ev_is_active (w)) 1387 if (expect_false (ev_is_active (w)))
1175 return; 1388 return;
1176 1389
1177 assert (("ev_io_start called with negative fd", fd >= 0)); 1390 assert (("ev_io_start called with negative fd", fd >= 0));
1178 1391
1179 ev_start (EV_A_ (W)w, 1); 1392 ev_start (EV_A_ (W)w, 1);
1180 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1393 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1181 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1394 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1182 1395
1183 fd_change (EV_A_ fd); 1396 fd_change (EV_A_ fd);
1184} 1397}
1185 1398
1186void 1399void
1187ev_io_stop (EV_P_ struct ev_io *w) 1400ev_io_stop (EV_P_ struct ev_io *w)
1188{ 1401{
1189 ev_clear_pending (EV_A_ (W)w); 1402 ev_clear_pending (EV_A_ (W)w);
1190 if (!ev_is_active (w)) 1403 if (expect_false (!ev_is_active (w)))
1191 return; 1404 return;
1405
1406 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1192 1407
1193 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1408 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1194 ev_stop (EV_A_ (W)w); 1409 ev_stop (EV_A_ (W)w);
1195 1410
1196 fd_change (EV_A_ w->fd); 1411 fd_change (EV_A_ w->fd);
1197} 1412}
1198 1413
1199void 1414void
1200ev_timer_start (EV_P_ struct ev_timer *w) 1415ev_timer_start (EV_P_ struct ev_timer *w)
1201{ 1416{
1202 if (ev_is_active (w)) 1417 if (expect_false (ev_is_active (w)))
1203 return; 1418 return;
1204 1419
1205 ((WT)w)->at += mn_now; 1420 ((WT)w)->at += mn_now;
1206 1421
1207 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1422 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1208 1423
1209 ev_start (EV_A_ (W)w, ++timercnt); 1424 ev_start (EV_A_ (W)w, ++timercnt);
1210 array_needsize (timers, timermax, timercnt, ); 1425 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1211 timers [timercnt - 1] = w; 1426 timers [timercnt - 1] = w;
1212 upheap ((WT *)timers, timercnt - 1); 1427 upheap ((WT *)timers, timercnt - 1);
1213 1428
1214 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1429 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1215} 1430}
1216 1431
1217void 1432void
1218ev_timer_stop (EV_P_ struct ev_timer *w) 1433ev_timer_stop (EV_P_ struct ev_timer *w)
1219{ 1434{
1220 ev_clear_pending (EV_A_ (W)w); 1435 ev_clear_pending (EV_A_ (W)w);
1221 if (!ev_is_active (w)) 1436 if (expect_false (!ev_is_active (w)))
1222 return; 1437 return;
1223 1438
1224 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1439 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1225 1440
1226 if (((W)w)->active < timercnt--) 1441 if (expect_true (((W)w)->active < timercnt--))
1227 { 1442 {
1228 timers [((W)w)->active - 1] = timers [timercnt]; 1443 timers [((W)w)->active - 1] = timers [timercnt];
1229 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1444 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1230 } 1445 }
1231 1446
1232 ((WT)w)->at = w->repeat; 1447 ((WT)w)->at -= mn_now;
1233 1448
1234 ev_stop (EV_A_ (W)w); 1449 ev_stop (EV_A_ (W)w);
1235} 1450}
1236 1451
1237void 1452void
1240 if (ev_is_active (w)) 1455 if (ev_is_active (w))
1241 { 1456 {
1242 if (w->repeat) 1457 if (w->repeat)
1243 { 1458 {
1244 ((WT)w)->at = mn_now + w->repeat; 1459 ((WT)w)->at = mn_now + w->repeat;
1245 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1460 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1246 } 1461 }
1247 else 1462 else
1248 ev_timer_stop (EV_A_ w); 1463 ev_timer_stop (EV_A_ w);
1249 } 1464 }
1250 else if (w->repeat) 1465 else if (w->repeat)
1466 {
1467 w->at = w->repeat;
1251 ev_timer_start (EV_A_ w); 1468 ev_timer_start (EV_A_ w);
1469 }
1252} 1470}
1253 1471
1472#if EV_PERIODICS
1254void 1473void
1255ev_periodic_start (EV_P_ struct ev_periodic *w) 1474ev_periodic_start (EV_P_ struct ev_periodic *w)
1256{ 1475{
1257 if (ev_is_active (w)) 1476 if (expect_false (ev_is_active (w)))
1258 return; 1477 return;
1259 1478
1479 if (w->reschedule_cb)
1480 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1481 else if (w->interval)
1482 {
1260 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1483 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1261
1262 /* this formula differs from the one in periodic_reify because we do not always round up */ 1484 /* this formula differs from the one in periodic_reify because we do not always round up */
1263 if (w->interval)
1264 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1485 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1486 }
1265 1487
1266 ev_start (EV_A_ (W)w, ++periodiccnt); 1488 ev_start (EV_A_ (W)w, ++periodiccnt);
1267 array_needsize (periodics, periodicmax, periodiccnt, ); 1489 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1268 periodics [periodiccnt - 1] = w; 1490 periodics [periodiccnt - 1] = w;
1269 upheap ((WT *)periodics, periodiccnt - 1); 1491 upheap ((WT *)periodics, periodiccnt - 1);
1270 1492
1271 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1493 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1272} 1494}
1273 1495
1274void 1496void
1275ev_periodic_stop (EV_P_ struct ev_periodic *w) 1497ev_periodic_stop (EV_P_ struct ev_periodic *w)
1276{ 1498{
1277 ev_clear_pending (EV_A_ (W)w); 1499 ev_clear_pending (EV_A_ (W)w);
1278 if (!ev_is_active (w)) 1500 if (expect_false (!ev_is_active (w)))
1279 return; 1501 return;
1280 1502
1281 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1503 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1282 1504
1283 if (((W)w)->active < periodiccnt--) 1505 if (expect_true (((W)w)->active < periodiccnt--))
1284 { 1506 {
1285 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1507 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1286 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1508 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1287 } 1509 }
1288 1510
1289 ev_stop (EV_A_ (W)w); 1511 ev_stop (EV_A_ (W)w);
1290} 1512}
1291 1513
1292void 1514void
1515ev_periodic_again (EV_P_ struct ev_periodic *w)
1516{
1517 /* TODO: use adjustheap and recalculation */
1518 ev_periodic_stop (EV_A_ w);
1519 ev_periodic_start (EV_A_ w);
1520}
1521#endif
1522
1523void
1293ev_idle_start (EV_P_ struct ev_idle *w) 1524ev_idle_start (EV_P_ struct ev_idle *w)
1294{ 1525{
1295 if (ev_is_active (w)) 1526 if (expect_false (ev_is_active (w)))
1296 return; 1527 return;
1297 1528
1298 ev_start (EV_A_ (W)w, ++idlecnt); 1529 ev_start (EV_A_ (W)w, ++idlecnt);
1299 array_needsize (idles, idlemax, idlecnt, ); 1530 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1300 idles [idlecnt - 1] = w; 1531 idles [idlecnt - 1] = w;
1301} 1532}
1302 1533
1303void 1534void
1304ev_idle_stop (EV_P_ struct ev_idle *w) 1535ev_idle_stop (EV_P_ struct ev_idle *w)
1305{ 1536{
1306 ev_clear_pending (EV_A_ (W)w); 1537 ev_clear_pending (EV_A_ (W)w);
1307 if (ev_is_active (w)) 1538 if (expect_false (!ev_is_active (w)))
1308 return; 1539 return;
1309 1540
1310 idles [((W)w)->active - 1] = idles [--idlecnt]; 1541 idles [((W)w)->active - 1] = idles [--idlecnt];
1311 ev_stop (EV_A_ (W)w); 1542 ev_stop (EV_A_ (W)w);
1312} 1543}
1313 1544
1314void 1545void
1315ev_prepare_start (EV_P_ struct ev_prepare *w) 1546ev_prepare_start (EV_P_ struct ev_prepare *w)
1316{ 1547{
1317 if (ev_is_active (w)) 1548 if (expect_false (ev_is_active (w)))
1318 return; 1549 return;
1319 1550
1320 ev_start (EV_A_ (W)w, ++preparecnt); 1551 ev_start (EV_A_ (W)w, ++preparecnt);
1321 array_needsize (prepares, preparemax, preparecnt, ); 1552 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1322 prepares [preparecnt - 1] = w; 1553 prepares [preparecnt - 1] = w;
1323} 1554}
1324 1555
1325void 1556void
1326ev_prepare_stop (EV_P_ struct ev_prepare *w) 1557ev_prepare_stop (EV_P_ struct ev_prepare *w)
1327{ 1558{
1328 ev_clear_pending (EV_A_ (W)w); 1559 ev_clear_pending (EV_A_ (W)w);
1329 if (ev_is_active (w)) 1560 if (expect_false (!ev_is_active (w)))
1330 return; 1561 return;
1331 1562
1332 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1563 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1333 ev_stop (EV_A_ (W)w); 1564 ev_stop (EV_A_ (W)w);
1334} 1565}
1335 1566
1336void 1567void
1337ev_check_start (EV_P_ struct ev_check *w) 1568ev_check_start (EV_P_ struct ev_check *w)
1338{ 1569{
1339 if (ev_is_active (w)) 1570 if (expect_false (ev_is_active (w)))
1340 return; 1571 return;
1341 1572
1342 ev_start (EV_A_ (W)w, ++checkcnt); 1573 ev_start (EV_A_ (W)w, ++checkcnt);
1343 array_needsize (checks, checkmax, checkcnt, ); 1574 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1344 checks [checkcnt - 1] = w; 1575 checks [checkcnt - 1] = w;
1345} 1576}
1346 1577
1347void 1578void
1348ev_check_stop (EV_P_ struct ev_check *w) 1579ev_check_stop (EV_P_ struct ev_check *w)
1349{ 1580{
1350 ev_clear_pending (EV_A_ (W)w); 1581 ev_clear_pending (EV_A_ (W)w);
1351 if (ev_is_active (w)) 1582 if (expect_false (!ev_is_active (w)))
1352 return; 1583 return;
1353 1584
1354 checks [((W)w)->active - 1] = checks [--checkcnt]; 1585 checks [((W)w)->active - 1] = checks [--checkcnt];
1355 ev_stop (EV_A_ (W)w); 1586 ev_stop (EV_A_ (W)w);
1356} 1587}
1361 1592
1362void 1593void
1363ev_signal_start (EV_P_ struct ev_signal *w) 1594ev_signal_start (EV_P_ struct ev_signal *w)
1364{ 1595{
1365#if EV_MULTIPLICITY 1596#if EV_MULTIPLICITY
1366 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1597 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1367#endif 1598#endif
1368 if (ev_is_active (w)) 1599 if (expect_false (ev_is_active (w)))
1369 return; 1600 return;
1370 1601
1371 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1602 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1372 1603
1373 ev_start (EV_A_ (W)w, 1); 1604 ev_start (EV_A_ (W)w, 1);
1374 array_needsize (signals, signalmax, w->signum, signals_init); 1605 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1375 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1606 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1376 1607
1377 if (!((WL)w)->next) 1608 if (!((WL)w)->next)
1378 { 1609 {
1379#if WIN32 1610#if _WIN32
1380 signal (w->signum, sighandler); 1611 signal (w->signum, sighandler);
1381#else 1612#else
1382 struct sigaction sa; 1613 struct sigaction sa;
1383 sa.sa_handler = sighandler; 1614 sa.sa_handler = sighandler;
1384 sigfillset (&sa.sa_mask); 1615 sigfillset (&sa.sa_mask);
1390 1621
1391void 1622void
1392ev_signal_stop (EV_P_ struct ev_signal *w) 1623ev_signal_stop (EV_P_ struct ev_signal *w)
1393{ 1624{
1394 ev_clear_pending (EV_A_ (W)w); 1625 ev_clear_pending (EV_A_ (W)w);
1395 if (!ev_is_active (w)) 1626 if (expect_false (!ev_is_active (w)))
1396 return; 1627 return;
1397 1628
1398 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1629 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1399 ev_stop (EV_A_ (W)w); 1630 ev_stop (EV_A_ (W)w);
1400 1631
1404 1635
1405void 1636void
1406ev_child_start (EV_P_ struct ev_child *w) 1637ev_child_start (EV_P_ struct ev_child *w)
1407{ 1638{
1408#if EV_MULTIPLICITY 1639#if EV_MULTIPLICITY
1409 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1640 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1410#endif 1641#endif
1411 if (ev_is_active (w)) 1642 if (expect_false (ev_is_active (w)))
1412 return; 1643 return;
1413 1644
1414 ev_start (EV_A_ (W)w, 1); 1645 ev_start (EV_A_ (W)w, 1);
1415 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1646 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1416} 1647}
1417 1648
1418void 1649void
1419ev_child_stop (EV_P_ struct ev_child *w) 1650ev_child_stop (EV_P_ struct ev_child *w)
1420{ 1651{
1421 ev_clear_pending (EV_A_ (W)w); 1652 ev_clear_pending (EV_A_ (W)w);
1422 if (ev_is_active (w)) 1653 if (expect_false (!ev_is_active (w)))
1423 return; 1654 return;
1424 1655
1425 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1656 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1426 ev_stop (EV_A_ (W)w); 1657 ev_stop (EV_A_ (W)w);
1427} 1658}
1462} 1693}
1463 1694
1464void 1695void
1465ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1696ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1466{ 1697{
1467 struct ev_once *once = ev_malloc (sizeof (struct ev_once)); 1698 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1468 1699
1469 if (!once) 1700 if (expect_false (!once))
1701 {
1470 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1702 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1471 else 1703 return;
1472 { 1704 }
1705
1473 once->cb = cb; 1706 once->cb = cb;
1474 once->arg = arg; 1707 once->arg = arg;
1475 1708
1476 ev_watcher_init (&once->io, once_cb_io); 1709 ev_init (&once->io, once_cb_io);
1477 if (fd >= 0) 1710 if (fd >= 0)
1478 { 1711 {
1479 ev_io_set (&once->io, fd, events); 1712 ev_io_set (&once->io, fd, events);
1480 ev_io_start (EV_A_ &once->io); 1713 ev_io_start (EV_A_ &once->io);
1481 } 1714 }
1482 1715
1483 ev_watcher_init (&once->to, once_cb_to); 1716 ev_init (&once->to, once_cb_to);
1484 if (timeout >= 0.) 1717 if (timeout >= 0.)
1485 { 1718 {
1486 ev_timer_set (&once->to, timeout, 0.); 1719 ev_timer_set (&once->to, timeout, 0.);
1487 ev_timer_start (EV_A_ &once->to); 1720 ev_timer_start (EV_A_ &once->to);
1488 }
1489 } 1721 }
1490} 1722}
1491 1723
1724#ifdef __cplusplus
1725}
1726#endif
1727

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines