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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines