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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines