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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines