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

Comparing libev/ev.c (file contents):
Revision 1.67 by root, Mon Nov 5 16:42:15 2007 UTC vs.
Revision 1.127 by root, Sun Nov 18 02:17:57 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines