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

Comparing libev/ev.c (file contents):
Revision 1.58 by root, Sun Nov 4 16:52:52 2007 UTC vs.
Revision 1.126 by root, Sun Nov 18 01:25:23 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines