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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines