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

Comparing libev/ev.c (file contents):
Revision 1.64 by root, Sun Nov 4 23:14:11 2007 UTC vs.
Revision 1.130 by root, Fri Nov 23 05:13:48 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines