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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines