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

Comparing libev/ev.c (file contents):
Revision 1.72 by root, Tue Nov 6 16:09:37 2007 UTC vs.
Revision 1.133 by root, Fri Nov 23 11:32:22 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines