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

Comparing libev/ev.c (file contents):
Revision 1.155 by root, Wed Nov 28 17:32:24 2007 UTC vs.
Revision 1.204 by root, Fri Jan 18 13:45:55 2008 UTC

2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * modification, are permitted provided that the following conditions are 8 * tion, are permitted provided that the following conditions are met:
9 * met: 9 *
10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE.
10 * 27 *
11 * * Redistributions of source code must retain the above copyright 28 * Alternatively, the contents of this file may be used under the terms of
12 * notice, this list of conditions and the following disclaimer. 29 * the GNU General Public License ("GPL") version 2 or any later version,
13 * 30 * in which case the provisions of the GPL are applicable instead of
14 * * Redistributions in binary form must reproduce the above 31 * the above. If you wish to allow the use of your version of this file
15 * copyright notice, this list of conditions and the following 32 * only under the terms of the GPL and not to allow others to use your
16 * disclaimer in the documentation and/or other materials provided 33 * version of this file under the BSD license, indicate your decision
17 * with the distribution. 34 * by deleting the provisions above and replace them with the notice
18 * 35 * and other provisions required by the GPL. If you do not delete the
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 36 * provisions above, a recipient may use your version of this file under
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 37 * either the BSD or the GPL.
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
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.
30 */ 38 */
31 39
32#ifdef __cplusplus 40#ifdef __cplusplus
33extern "C" { 41extern "C" {
34#endif 42#endif
51# ifndef EV_USE_MONOTONIC 59# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 60# define EV_USE_MONOTONIC 0
53# endif 61# endif
54# ifndef EV_USE_REALTIME 62# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 63# define EV_USE_REALTIME 0
64# endif
65# endif
66
67# ifndef EV_USE_NANOSLEEP
68# if HAVE_NANOSLEEP
69# define EV_USE_NANOSLEEP 1
70# else
71# define EV_USE_NANOSLEEP 0
56# endif 72# endif
57# endif 73# endif
58 74
59# ifndef EV_USE_SELECT 75# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 76# if HAVE_SELECT && HAVE_SYS_SELECT_H
146 162
147#ifndef EV_USE_REALTIME 163#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0 164# define EV_USE_REALTIME 0
149#endif 165#endif
150 166
167#ifndef EV_USE_NANOSLEEP
168# define EV_USE_NANOSLEEP 0
169#endif
170
151#ifndef EV_USE_SELECT 171#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 172# define EV_USE_SELECT 1
153#endif 173#endif
154 174
155#ifndef EV_USE_POLL 175#ifndef EV_USE_POLL
202#ifndef CLOCK_REALTIME 222#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 223# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 224# define EV_USE_REALTIME 0
205#endif 225#endif
206 226
227#if !EV_STAT_ENABLE
228# undef EV_USE_INOTIFY
229# define EV_USE_INOTIFY 0
230#endif
231
232#if !EV_USE_NANOSLEEP
233# ifndef _WIN32
234# include <sys/select.h>
235# endif
236#endif
237
238#if EV_USE_INOTIFY
239# include <sys/inotify.h>
240#endif
241
207#if EV_SELECT_IS_WINSOCKET 242#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 243# include <winsock.h>
209#endif 244#endif
210 245
211#if !EV_STAT_ENABLE
212# define EV_USE_INOTIFY 0
213#endif
214
215#if EV_USE_INOTIFY
216# include <sys/inotify.h>
217#endif
218
219/**/ 246/**/
247
248/*
249 * This is used to avoid floating point rounding problems.
250 * It is added to ev_rt_now when scheduling periodics
251 * to ensure progress, time-wise, even when rounding
252 * errors are against us.
253 * This value is good at least till the year 4000.
254 * Better solutions welcome.
255 */
256#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
220 257
221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 258#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
222#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 259#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 260/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
224 261
225#if __GNUC__ >= 3 262#if __GNUC__ >= 4
226# define expect(expr,value) __builtin_expect ((expr),(value)) 263# define expect(expr,value) __builtin_expect ((expr),(value))
227# define inline_size static inline /* inline for codesize */
228# if EV_MINIMAL
229# define noinline __attribute__ ((noinline)) 264# define noinline __attribute__ ((noinline))
230# define inline_speed static noinline
231# else
232# define noinline
233# define inline_speed static inline
234# endif
235#else 265#else
236# define expect(expr,value) (expr) 266# define expect(expr,value) (expr)
237# define inline_speed static
238# define inline_size static
239# define noinline 267# define noinline
268# if __STDC_VERSION__ < 199901L
269# define inline
270# endif
240#endif 271#endif
241 272
242#define expect_false(expr) expect ((expr) != 0, 0) 273#define expect_false(expr) expect ((expr) != 0, 0)
243#define expect_true(expr) expect ((expr) != 0, 1) 274#define expect_true(expr) expect ((expr) != 0, 1)
275#define inline_size static inline
276
277#if EV_MINIMAL
278# define inline_speed static noinline
279#else
280# define inline_speed static inline
281#endif
244 282
245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 283#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
246#define ABSPRI(w) ((w)->priority - EV_MINPRI) 284#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247 285
248#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 286#define EMPTY /* required for microsofts broken pseudo-c compiler */
249#define EMPTY2(a,b) /* used to suppress some warnings */ 287#define EMPTY2(a,b) /* used to suppress some warnings */
250 288
251typedef ev_watcher *W; 289typedef ev_watcher *W;
252typedef ev_watcher_list *WL; 290typedef ev_watcher_list *WL;
253typedef ev_watcher_time *WT; 291typedef ev_watcher_time *WT;
254 292
293#if EV_USE_MONOTONIC
294/* sig_atomic_t is used to avoid per-thread variables or locking but still */
295/* giving it a reasonably high chance of working on typical architetcures */
255static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 296static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
297#endif
256 298
257#ifdef _WIN32 299#ifdef _WIN32
258# include "ev_win32.c" 300# include "ev_win32.c"
259#endif 301#endif
260 302
396{ 438{
397 return ev_rt_now; 439 return ev_rt_now;
398} 440}
399#endif 441#endif
400 442
401#define array_roundsize(type,n) (((n) | 4) & ~3) 443void
444ev_sleep (ev_tstamp delay)
445{
446 if (delay > 0.)
447 {
448#if EV_USE_NANOSLEEP
449 struct timespec ts;
450
451 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453
454 nanosleep (&ts, 0);
455#elif defined(_WIN32)
456 Sleep (delay * 1e3);
457#else
458 struct timeval tv;
459
460 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
462
463 select (0, 0, 0, 0, &tv);
464#endif
465 }
466}
467
468/*****************************************************************************/
469
470int inline_size
471array_nextsize (int elem, int cur, int cnt)
472{
473 int ncur = cur + 1;
474
475 do
476 ncur <<= 1;
477 while (cnt > ncur);
478
479 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
480 if (elem * ncur > 4096)
481 {
482 ncur *= elem;
483 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
484 ncur = ncur - sizeof (void *) * 4;
485 ncur /= elem;
486 }
487
488 return ncur;
489}
490
491static noinline void *
492array_realloc (int elem, void *base, int *cur, int cnt)
493{
494 *cur = array_nextsize (elem, *cur, cnt);
495 return ev_realloc (base, elem * *cur);
496}
402 497
403#define array_needsize(type,base,cur,cnt,init) \ 498#define array_needsize(type,base,cur,cnt,init) \
404 if (expect_false ((cnt) > cur)) \ 499 if (expect_false ((cnt) > (cur))) \
405 { \ 500 { \
406 int newcnt = cur; \ 501 int ocur_ = (cur); \
407 do \ 502 (base) = (type *)array_realloc \
408 { \ 503 (sizeof (type), (base), &(cur), (cnt)); \
409 newcnt = array_roundsize (type, newcnt << 1); \ 504 init ((base) + (ocur_), (cur) - ocur_); \
410 } \
411 while ((cnt) > newcnt); \
412 \
413 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
414 init (base + cur, newcnt - cur); \
415 cur = newcnt; \
416 } 505 }
417 506
507#if 0
418#define array_slim(type,stem) \ 508#define array_slim(type,stem) \
419 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 509 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
420 { \ 510 { \
421 stem ## max = array_roundsize (stem ## cnt >> 1); \ 511 stem ## max = array_roundsize (stem ## cnt >> 1); \
422 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 512 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
423 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 513 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
424 } 514 }
515#endif
425 516
426#define array_free(stem, idx) \ 517#define array_free(stem, idx) \
427 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 518 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
428 519
429/*****************************************************************************/ 520/*****************************************************************************/
430 521
431void noinline 522void noinline
432ev_feed_event (EV_P_ void *w, int revents) 523ev_feed_event (EV_P_ void *w, int revents)
433{ 524{
434 W w_ = (W)w; 525 W w_ = (W)w;
526 int pri = ABSPRI (w_);
435 527
436 if (expect_false (w_->pending)) 528 if (expect_false (w_->pending))
529 pendings [pri][w_->pending - 1].events |= revents;
530 else
437 { 531 {
532 w_->pending = ++pendingcnt [pri];
533 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
534 pendings [pri][w_->pending - 1].w = w_;
438 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 535 pendings [pri][w_->pending - 1].events = revents;
439 return;
440 } 536 }
441
442 w_->pending = ++pendingcnt [ABSPRI (w_)];
443 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
444 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
445 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
446} 537}
447 538
448void inline_size 539void inline_speed
449queue_events (EV_P_ W *events, int eventcnt, int type) 540queue_events (EV_P_ W *events, int eventcnt, int type)
450{ 541{
451 int i; 542 int i;
452 543
453 for (i = 0; i < eventcnt; ++i) 544 for (i = 0; i < eventcnt; ++i)
485} 576}
486 577
487void 578void
488ev_feed_fd_event (EV_P_ int fd, int revents) 579ev_feed_fd_event (EV_P_ int fd, int revents)
489{ 580{
581 if (fd >= 0 && fd < anfdmax)
490 fd_event (EV_A_ fd, revents); 582 fd_event (EV_A_ fd, revents);
491} 583}
492 584
493void inline_size 585void inline_size
494fd_reify (EV_P) 586fd_reify (EV_P)
495{ 587{
499 { 591 {
500 int fd = fdchanges [i]; 592 int fd = fdchanges [i];
501 ANFD *anfd = anfds + fd; 593 ANFD *anfd = anfds + fd;
502 ev_io *w; 594 ev_io *w;
503 595
504 int events = 0; 596 unsigned char events = 0;
505 597
506 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 598 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
507 events |= w->events; 599 events |= (unsigned char)w->events;
508 600
509#if EV_SELECT_IS_WINSOCKET 601#if EV_SELECT_IS_WINSOCKET
510 if (events) 602 if (events)
511 { 603 {
512 unsigned long argp; 604 unsigned long argp;
605 #ifdef EV_FD_TO_WIN32_HANDLE
606 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
607 #else
513 anfd->handle = _get_osfhandle (fd); 608 anfd->handle = _get_osfhandle (fd);
609 #endif
514 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 610 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
515 } 611 }
516#endif 612#endif
517 613
614 {
615 unsigned char o_events = anfd->events;
616 unsigned char o_reify = anfd->reify;
617
518 anfd->reify = 0; 618 anfd->reify = 0;
519
520 backend_modify (EV_A_ fd, anfd->events, events);
521 anfd->events = events; 619 anfd->events = events;
620
621 if (o_events != events || o_reify & EV_IOFDSET)
622 backend_modify (EV_A_ fd, o_events, events);
623 }
522 } 624 }
523 625
524 fdchangecnt = 0; 626 fdchangecnt = 0;
525} 627}
526 628
527void inline_size 629void inline_size
528fd_change (EV_P_ int fd) 630fd_change (EV_P_ int fd, int flags)
529{ 631{
530 if (expect_false (anfds [fd].reify)) 632 unsigned char reify = anfds [fd].reify;
531 return;
532
533 anfds [fd].reify = 1; 633 anfds [fd].reify |= flags;
534 634
635 if (expect_true (!reify))
636 {
535 ++fdchangecnt; 637 ++fdchangecnt;
536 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 638 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
537 fdchanges [fdchangecnt - 1] = fd; 639 fdchanges [fdchangecnt - 1] = fd;
640 }
538} 641}
539 642
540void inline_speed 643void inline_speed
541fd_kill (EV_P_ int fd) 644fd_kill (EV_P_ int fd)
542{ 645{
589static void noinline 692static void noinline
590fd_rearm_all (EV_P) 693fd_rearm_all (EV_P)
591{ 694{
592 int fd; 695 int fd;
593 696
594 /* this should be highly optimised to not do anything but set a flag */
595 for (fd = 0; fd < anfdmax; ++fd) 697 for (fd = 0; fd < anfdmax; ++fd)
596 if (anfds [fd].events) 698 if (anfds [fd].events)
597 { 699 {
598 anfds [fd].events = 0; 700 anfds [fd].events = 0;
599 fd_change (EV_A_ fd); 701 fd_change (EV_A_ fd, EV_IOFDSET | 1);
600 } 702 }
601} 703}
602 704
603/*****************************************************************************/ 705/*****************************************************************************/
604 706
605void inline_speed 707void inline_speed
606upheap (WT *heap, int k) 708upheap (WT *heap, int k)
607{ 709{
608 WT w = heap [k]; 710 WT w = heap [k];
609 711
610 while (k && heap [k >> 1]->at > w->at) 712 while (k)
611 { 713 {
714 int p = (k - 1) >> 1;
715
716 if (heap [p]->at <= w->at)
717 break;
718
612 heap [k] = heap [k >> 1]; 719 heap [k] = heap [p];
613 ((W)heap [k])->active = k + 1; 720 ((W)heap [k])->active = k + 1;
614 k >>= 1; 721 k = p;
615 } 722 }
616 723
617 heap [k] = w; 724 heap [k] = w;
618 ((W)heap [k])->active = k + 1; 725 ((W)heap [k])->active = k + 1;
619
620} 726}
621 727
622void inline_speed 728void inline_speed
623downheap (WT *heap, int N, int k) 729downheap (WT *heap, int N, int k)
624{ 730{
625 WT w = heap [k]; 731 WT w = heap [k];
626 732
627 while (k < (N >> 1)) 733 for (;;)
628 { 734 {
629 int j = k << 1; 735 int c = (k << 1) + 1;
630 736
631 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 737 if (c >= N)
632 ++j;
633
634 if (w->at <= heap [j]->at)
635 break; 738 break;
636 739
740 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
741 ? 1 : 0;
742
743 if (w->at <= heap [c]->at)
744 break;
745
637 heap [k] = heap [j]; 746 heap [k] = heap [c];
638 ((W)heap [k])->active = k + 1; 747 ((W)heap [k])->active = k + 1;
748
639 k = j; 749 k = c;
640 } 750 }
641 751
642 heap [k] = w; 752 heap [k] = w;
643 ((W)heap [k])->active = k + 1; 753 ((W)heap [k])->active = k + 1;
644} 754}
726 for (signum = signalmax; signum--; ) 836 for (signum = signalmax; signum--; )
727 if (signals [signum].gotsig) 837 if (signals [signum].gotsig)
728 ev_feed_signal_event (EV_A_ signum + 1); 838 ev_feed_signal_event (EV_A_ signum + 1);
729} 839}
730 840
731void inline_size 841void inline_speed
732fd_intern (int fd) 842fd_intern (int fd)
733{ 843{
734#ifdef _WIN32 844#ifdef _WIN32
735 int arg = 1; 845 int arg = 1;
736 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 846 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
751 ev_unref (EV_A); /* child watcher should not keep loop alive */ 861 ev_unref (EV_A); /* child watcher should not keep loop alive */
752} 862}
753 863
754/*****************************************************************************/ 864/*****************************************************************************/
755 865
756static ev_child *childs [EV_PID_HASHSIZE]; 866static WL childs [EV_PID_HASHSIZE];
757 867
758#ifndef _WIN32 868#ifndef _WIN32
759 869
760static ev_signal childev; 870static ev_signal childev;
761 871
765 ev_child *w; 875 ev_child *w;
766 876
767 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 877 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
768 if (w->pid == pid || !w->pid) 878 if (w->pid == pid || !w->pid)
769 { 879 {
770 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 880 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
771 w->rpid = pid; 881 w->rpid = pid;
772 w->rstatus = status; 882 w->rstatus = status;
773 ev_feed_event (EV_A_ (W)w, EV_CHILD); 883 ev_feed_event (EV_A_ (W)w, EV_CHILD);
774 } 884 }
775} 885}
776 886
777#ifndef WCONTINUED 887#ifndef WCONTINUED
876} 986}
877 987
878unsigned int 988unsigned int
879ev_embeddable_backends (void) 989ev_embeddable_backends (void)
880{ 990{
881 return EVBACKEND_EPOLL 991 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
882 | EVBACKEND_KQUEUE 992
883 | EVBACKEND_PORT; 993 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
994 /* please fix it and tell me how to detect the fix */
995 flags &= ~EVBACKEND_EPOLL;
996
997 return flags;
884} 998}
885 999
886unsigned int 1000unsigned int
887ev_backend (EV_P) 1001ev_backend (EV_P)
888{ 1002{
889 return backend; 1003 return backend;
1004}
1005
1006unsigned int
1007ev_loop_count (EV_P)
1008{
1009 return loop_count;
1010}
1011
1012void
1013ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1014{
1015 io_blocktime = interval;
1016}
1017
1018void
1019ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1020{
1021 timeout_blocktime = interval;
890} 1022}
891 1023
892static void noinline 1024static void noinline
893loop_init (EV_P_ unsigned int flags) 1025loop_init (EV_P_ unsigned int flags)
894{ 1026{
905 ev_rt_now = ev_time (); 1037 ev_rt_now = ev_time ();
906 mn_now = get_clock (); 1038 mn_now = get_clock ();
907 now_floor = mn_now; 1039 now_floor = mn_now;
908 rtmn_diff = ev_rt_now - mn_now; 1040 rtmn_diff = ev_rt_now - mn_now;
909 1041
1042 io_blocktime = 0.;
1043 timeout_blocktime = 0.;
1044
1045 /* pid check not overridable via env */
1046#ifndef _WIN32
1047 if (flags & EVFLAG_FORKCHECK)
1048 curpid = getpid ();
1049#endif
1050
910 if (!(flags & EVFLAG_NOENV) 1051 if (!(flags & EVFLAG_NOENV)
911 && !enable_secure () 1052 && !enable_secure ()
912 && getenv ("LIBEV_FLAGS")) 1053 && getenv ("LIBEV_FLAGS"))
913 flags = atoi (getenv ("LIBEV_FLAGS")); 1054 flags = atoi (getenv ("LIBEV_FLAGS"));
914 1055
970#if EV_USE_SELECT 1111#if EV_USE_SELECT
971 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1112 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
972#endif 1113#endif
973 1114
974 for (i = NUMPRI; i--; ) 1115 for (i = NUMPRI; i--; )
1116 {
975 array_free (pending, [i]); 1117 array_free (pending, [i]);
1118#if EV_IDLE_ENABLE
1119 array_free (idle, [i]);
1120#endif
1121 }
1122
1123 ev_free (anfds); anfdmax = 0;
976 1124
977 /* have to use the microsoft-never-gets-it-right macro */ 1125 /* have to use the microsoft-never-gets-it-right macro */
978 array_free (fdchange, EMPTY0); 1126 array_free (fdchange, EMPTY);
979 array_free (timer, EMPTY0); 1127 array_free (timer, EMPTY);
980#if EV_PERIODIC_ENABLE 1128#if EV_PERIODIC_ENABLE
981 array_free (periodic, EMPTY0); 1129 array_free (periodic, EMPTY);
982#endif 1130#endif
1131#if EV_FORK_ENABLE
983 array_free (idle, EMPTY0); 1132 array_free (fork, EMPTY);
1133#endif
984 array_free (prepare, EMPTY0); 1134 array_free (prepare, EMPTY);
985 array_free (check, EMPTY0); 1135 array_free (check, EMPTY);
986 1136
987 backend = 0; 1137 backend = 0;
988} 1138}
989 1139
990void inline_size infy_fork (EV_P); 1140void inline_size infy_fork (EV_P);
1016 1166
1017 while (pipe (sigpipe)) 1167 while (pipe (sigpipe))
1018 syserr ("(libev) error creating pipe"); 1168 syserr ("(libev) error creating pipe");
1019 1169
1020 siginit (EV_A); 1170 siginit (EV_A);
1171 sigcb (EV_A_ &sigev, EV_READ);
1021 } 1172 }
1022 1173
1023 postfork = 0; 1174 postfork = 0;
1024} 1175}
1025 1176
1047} 1198}
1048 1199
1049void 1200void
1050ev_loop_fork (EV_P) 1201ev_loop_fork (EV_P)
1051{ 1202{
1052 postfork = 1; 1203 postfork = 1; // must be in line with ev_default_fork
1053} 1204}
1054 1205
1055#endif 1206#endif
1056 1207
1057#if EV_MULTIPLICITY 1208#if EV_MULTIPLICITY
1121#if EV_MULTIPLICITY 1272#if EV_MULTIPLICITY
1122 struct ev_loop *loop = ev_default_loop_ptr; 1273 struct ev_loop *loop = ev_default_loop_ptr;
1123#endif 1274#endif
1124 1275
1125 if (backend) 1276 if (backend)
1126 postfork = 1; 1277 postfork = 1; // must be in line with ev_loop_fork
1127} 1278}
1128 1279
1129/*****************************************************************************/ 1280/*****************************************************************************/
1130 1281
1131int inline_size 1282void
1132any_pending (EV_P) 1283ev_invoke (EV_P_ void *w, int revents)
1133{ 1284{
1134 int pri; 1285 EV_CB_INVOKE ((W)w, revents);
1135
1136 for (pri = NUMPRI; pri--; )
1137 if (pendingcnt [pri])
1138 return 1;
1139
1140 return 0;
1141} 1286}
1142 1287
1143void inline_speed 1288void inline_speed
1144call_pending (EV_P) 1289call_pending (EV_P)
1145{ 1290{
1163void inline_size 1308void inline_size
1164timers_reify (EV_P) 1309timers_reify (EV_P)
1165{ 1310{
1166 while (timercnt && ((WT)timers [0])->at <= mn_now) 1311 while (timercnt && ((WT)timers [0])->at <= mn_now)
1167 { 1312 {
1168 ev_timer *w = timers [0]; 1313 ev_timer *w = (ev_timer *)timers [0];
1169 1314
1170 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1315 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1171 1316
1172 /* first reschedule or stop timer */ 1317 /* first reschedule or stop timer */
1173 if (w->repeat) 1318 if (w->repeat)
1176 1321
1177 ((WT)w)->at += w->repeat; 1322 ((WT)w)->at += w->repeat;
1178 if (((WT)w)->at < mn_now) 1323 if (((WT)w)->at < mn_now)
1179 ((WT)w)->at = mn_now; 1324 ((WT)w)->at = mn_now;
1180 1325
1181 downheap ((WT *)timers, timercnt, 0); 1326 downheap (timers, timercnt, 0);
1182 } 1327 }
1183 else 1328 else
1184 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1329 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1185 1330
1186 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1331 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1191void inline_size 1336void inline_size
1192periodics_reify (EV_P) 1337periodics_reify (EV_P)
1193{ 1338{
1194 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1339 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1195 { 1340 {
1196 ev_periodic *w = periodics [0]; 1341 ev_periodic *w = (ev_periodic *)periodics [0];
1197 1342
1198 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1343 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1199 1344
1200 /* first reschedule or stop timer */ 1345 /* first reschedule or stop timer */
1201 if (w->reschedule_cb) 1346 if (w->reschedule_cb)
1202 { 1347 {
1203 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1348 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1204 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1349 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1205 downheap ((WT *)periodics, periodiccnt, 0); 1350 downheap (periodics, periodiccnt, 0);
1206 } 1351 }
1207 else if (w->interval) 1352 else if (w->interval)
1208 { 1353 {
1209 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1354 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1355 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1210 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1356 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1211 downheap ((WT *)periodics, periodiccnt, 0); 1357 downheap (periodics, periodiccnt, 0);
1212 } 1358 }
1213 else 1359 else
1214 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1360 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1215 1361
1216 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1362 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1223 int i; 1369 int i;
1224 1370
1225 /* adjust periodics after time jump */ 1371 /* adjust periodics after time jump */
1226 for (i = 0; i < periodiccnt; ++i) 1372 for (i = 0; i < periodiccnt; ++i)
1227 { 1373 {
1228 ev_periodic *w = periodics [i]; 1374 ev_periodic *w = (ev_periodic *)periodics [i];
1229 1375
1230 if (w->reschedule_cb) 1376 if (w->reschedule_cb)
1231 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1377 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1232 else if (w->interval) 1378 else if (w->interval)
1233 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1379 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1234 } 1380 }
1235 1381
1236 /* now rebuild the heap */ 1382 /* now rebuild the heap */
1237 for (i = periodiccnt >> 1; i--; ) 1383 for (i = periodiccnt >> 1; i--; )
1238 downheap ((WT *)periodics, periodiccnt, i); 1384 downheap (periodics, periodiccnt, i);
1239} 1385}
1240#endif 1386#endif
1241 1387
1388#if EV_IDLE_ENABLE
1242int inline_size 1389void inline_size
1243time_update_monotonic (EV_P) 1390idle_reify (EV_P)
1244{ 1391{
1392 if (expect_false (idleall))
1393 {
1394 int pri;
1395
1396 for (pri = NUMPRI; pri--; )
1397 {
1398 if (pendingcnt [pri])
1399 break;
1400
1401 if (idlecnt [pri])
1402 {
1403 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1404 break;
1405 }
1406 }
1407 }
1408}
1409#endif
1410
1411void inline_speed
1412time_update (EV_P_ ev_tstamp max_block)
1413{
1414 int i;
1415
1416#if EV_USE_MONOTONIC
1417 if (expect_true (have_monotonic))
1418 {
1419 ev_tstamp odiff = rtmn_diff;
1420
1245 mn_now = get_clock (); 1421 mn_now = get_clock ();
1246 1422
1423 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1424 /* interpolate in the meantime */
1247 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1425 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1248 { 1426 {
1249 ev_rt_now = rtmn_diff + mn_now; 1427 ev_rt_now = rtmn_diff + mn_now;
1250 return 0; 1428 return;
1251 } 1429 }
1252 else 1430
1253 {
1254 now_floor = mn_now; 1431 now_floor = mn_now;
1255 ev_rt_now = ev_time (); 1432 ev_rt_now = ev_time ();
1256 return 1;
1257 }
1258}
1259 1433
1260void inline_size 1434 /* loop a few times, before making important decisions.
1261time_update (EV_P) 1435 * on the choice of "4": one iteration isn't enough,
1262{ 1436 * in case we get preempted during the calls to
1263 int i; 1437 * ev_time and get_clock. a second call is almost guaranteed
1264 1438 * to succeed in that case, though. and looping a few more times
1265#if EV_USE_MONOTONIC 1439 * doesn't hurt either as we only do this on time-jumps or
1266 if (expect_true (have_monotonic)) 1440 * in the unlikely event of having been preempted here.
1267 { 1441 */
1268 if (time_update_monotonic (EV_A)) 1442 for (i = 4; --i; )
1269 { 1443 {
1270 ev_tstamp odiff = rtmn_diff;
1271
1272 /* loop a few times, before making important decisions.
1273 * on the choice of "4": one iteration isn't enough,
1274 * in case we get preempted during the calls to
1275 * ev_time and get_clock. a second call is almost guarenteed
1276 * to succeed in that case, though. and looping a few more times
1277 * doesn't hurt either as we only do this on time-jumps or
1278 * in the unlikely event of getting preempted here.
1279 */
1280 for (i = 4; --i; )
1281 {
1282 rtmn_diff = ev_rt_now - mn_now; 1444 rtmn_diff = ev_rt_now - mn_now;
1283 1445
1284 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1446 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1285 return; /* all is well */ 1447 return; /* all is well */
1286 1448
1287 ev_rt_now = ev_time (); 1449 ev_rt_now = ev_time ();
1288 mn_now = get_clock (); 1450 mn_now = get_clock ();
1289 now_floor = mn_now; 1451 now_floor = mn_now;
1290 } 1452 }
1291 1453
1292# if EV_PERIODIC_ENABLE 1454# if EV_PERIODIC_ENABLE
1293 periodics_reschedule (EV_A); 1455 periodics_reschedule (EV_A);
1294# endif 1456# endif
1295 /* no timer adjustment, as the monotonic clock doesn't jump */ 1457 /* no timer adjustment, as the monotonic clock doesn't jump */
1296 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1458 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1297 }
1298 } 1459 }
1299 else 1460 else
1300#endif 1461#endif
1301 { 1462 {
1302 ev_rt_now = ev_time (); 1463 ev_rt_now = ev_time ();
1303 1464
1304 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1465 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1305 { 1466 {
1306#if EV_PERIODIC_ENABLE 1467#if EV_PERIODIC_ENABLE
1307 periodics_reschedule (EV_A); 1468 periodics_reschedule (EV_A);
1308#endif 1469#endif
1309
1310 /* adjust timers. this is easy, as the offset is the same for all */ 1470 /* adjust timers. this is easy, as the offset is the same for all of them */
1311 for (i = 0; i < timercnt; ++i) 1471 for (i = 0; i < timercnt; ++i)
1312 ((WT)timers [i])->at += ev_rt_now - mn_now; 1472 ((WT)timers [i])->at += ev_rt_now - mn_now;
1313 } 1473 }
1314 1474
1315 mn_now = ev_rt_now; 1475 mn_now = ev_rt_now;
1335{ 1495{
1336 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1496 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1337 ? EVUNLOOP_ONE 1497 ? EVUNLOOP_ONE
1338 : EVUNLOOP_CANCEL; 1498 : EVUNLOOP_CANCEL;
1339 1499
1340 while (activecnt) 1500 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1501
1502 do
1341 { 1503 {
1342 /* we might have forked, so reify kernel state if necessary */ 1504#ifndef _WIN32
1505 if (expect_false (curpid)) /* penalise the forking check even more */
1506 if (expect_false (getpid () != curpid))
1507 {
1508 curpid = getpid ();
1509 postfork = 1;
1510 }
1511#endif
1512
1343 #if EV_FORK_ENABLE 1513#if EV_FORK_ENABLE
1514 /* we might have forked, so queue fork handlers */
1344 if (expect_false (postfork)) 1515 if (expect_false (postfork))
1345 if (forkcnt) 1516 if (forkcnt)
1346 { 1517 {
1347 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1518 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1348 call_pending (EV_A); 1519 call_pending (EV_A);
1349 } 1520 }
1350 #endif 1521#endif
1351 1522
1352 /* queue check watchers (and execute them) */ 1523 /* queue prepare watchers (and execute them) */
1353 if (expect_false (preparecnt)) 1524 if (expect_false (preparecnt))
1354 { 1525 {
1355 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1526 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1356 call_pending (EV_A); 1527 call_pending (EV_A);
1357 } 1528 }
1358 1529
1530 if (expect_false (!activecnt))
1531 break;
1532
1359 /* we might have forked, so reify kernel state if necessary */ 1533 /* we might have forked, so reify kernel state if necessary */
1360 if (expect_false (postfork)) 1534 if (expect_false (postfork))
1361 loop_fork (EV_A); 1535 loop_fork (EV_A);
1362 1536
1363 /* update fd-related kernel structures */ 1537 /* update fd-related kernel structures */
1364 fd_reify (EV_A); 1538 fd_reify (EV_A);
1365 1539
1366 /* calculate blocking time */ 1540 /* calculate blocking time */
1367 { 1541 {
1368 double block; 1542 ev_tstamp waittime = 0.;
1543 ev_tstamp sleeptime = 0.;
1369 1544
1370 if (flags & EVLOOP_NONBLOCK || idlecnt) 1545 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1371 block = 0.; /* do not block at all */
1372 else
1373 { 1546 {
1374 /* update time to cancel out callback processing overhead */ 1547 /* update time to cancel out callback processing overhead */
1375#if EV_USE_MONOTONIC
1376 if (expect_true (have_monotonic))
1377 time_update_monotonic (EV_A); 1548 time_update (EV_A_ 1e100);
1378 else
1379#endif
1380 {
1381 ev_rt_now = ev_time ();
1382 mn_now = ev_rt_now;
1383 }
1384 1549
1385 block = MAX_BLOCKTIME; 1550 waittime = MAX_BLOCKTIME;
1386 1551
1387 if (timercnt) 1552 if (timercnt)
1388 { 1553 {
1389 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1554 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1390 if (block > to) block = to; 1555 if (waittime > to) waittime = to;
1391 } 1556 }
1392 1557
1393#if EV_PERIODIC_ENABLE 1558#if EV_PERIODIC_ENABLE
1394 if (periodiccnt) 1559 if (periodiccnt)
1395 { 1560 {
1396 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1561 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1397 if (block > to) block = to; 1562 if (waittime > to) waittime = to;
1398 } 1563 }
1399#endif 1564#endif
1400 1565
1401 if (expect_false (block < 0.)) block = 0.; 1566 if (expect_false (waittime < timeout_blocktime))
1567 waittime = timeout_blocktime;
1568
1569 sleeptime = waittime - backend_fudge;
1570
1571 if (expect_true (sleeptime > io_blocktime))
1572 sleeptime = io_blocktime;
1573
1574 if (sleeptime)
1575 {
1576 ev_sleep (sleeptime);
1577 waittime -= sleeptime;
1578 }
1402 } 1579 }
1403 1580
1581 ++loop_count;
1404 backend_poll (EV_A_ block); 1582 backend_poll (EV_A_ waittime);
1583
1584 /* update ev_rt_now, do magic */
1585 time_update (EV_A_ waittime + sleeptime);
1405 } 1586 }
1406
1407 /* update ev_rt_now, do magic */
1408 time_update (EV_A);
1409 1587
1410 /* queue pending timers and reschedule them */ 1588 /* queue pending timers and reschedule them */
1411 timers_reify (EV_A); /* relative timers called last */ 1589 timers_reify (EV_A); /* relative timers called last */
1412#if EV_PERIODIC_ENABLE 1590#if EV_PERIODIC_ENABLE
1413 periodics_reify (EV_A); /* absolute timers called first */ 1591 periodics_reify (EV_A); /* absolute timers called first */
1414#endif 1592#endif
1415 1593
1594#if EV_IDLE_ENABLE
1416 /* queue idle watchers unless other events are pending */ 1595 /* queue idle watchers unless other events are pending */
1417 if (idlecnt && !any_pending (EV_A)) 1596 idle_reify (EV_A);
1418 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1597#endif
1419 1598
1420 /* queue check watchers, to be executed first */ 1599 /* queue check watchers, to be executed first */
1421 if (expect_false (checkcnt)) 1600 if (expect_false (checkcnt))
1422 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1601 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1423 1602
1424 call_pending (EV_A); 1603 call_pending (EV_A);
1425 1604
1426 if (expect_false (loop_done))
1427 break;
1428 } 1605 }
1606 while (expect_true (activecnt && !loop_done));
1429 1607
1430 if (loop_done == EVUNLOOP_ONE) 1608 if (loop_done == EVUNLOOP_ONE)
1431 loop_done = EVUNLOOP_CANCEL; 1609 loop_done = EVUNLOOP_CANCEL;
1432} 1610}
1433 1611
1460 head = &(*head)->next; 1638 head = &(*head)->next;
1461 } 1639 }
1462} 1640}
1463 1641
1464void inline_speed 1642void inline_speed
1465ev_clear_pending (EV_P_ W w) 1643clear_pending (EV_P_ W w)
1466{ 1644{
1467 if (w->pending) 1645 if (w->pending)
1468 { 1646 {
1469 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1647 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1470 w->pending = 0; 1648 w->pending = 0;
1471 } 1649 }
1472} 1650}
1473 1651
1652int
1653ev_clear_pending (EV_P_ void *w)
1654{
1655 W w_ = (W)w;
1656 int pending = w_->pending;
1657
1658 if (expect_true (pending))
1659 {
1660 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1661 w_->pending = 0;
1662 p->w = 0;
1663 return p->events;
1664 }
1665 else
1666 return 0;
1667}
1668
1669void inline_size
1670pri_adjust (EV_P_ W w)
1671{
1672 int pri = w->priority;
1673 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1674 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1675 w->priority = pri;
1676}
1677
1474void inline_speed 1678void inline_speed
1475ev_start (EV_P_ W w, int active) 1679ev_start (EV_P_ W w, int active)
1476{ 1680{
1477 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1681 pri_adjust (EV_A_ w);
1478 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1479
1480 w->active = active; 1682 w->active = active;
1481 ev_ref (EV_A); 1683 ev_ref (EV_A);
1482} 1684}
1483 1685
1484void inline_size 1686void inline_size
1488 w->active = 0; 1690 w->active = 0;
1489} 1691}
1490 1692
1491/*****************************************************************************/ 1693/*****************************************************************************/
1492 1694
1493void 1695void noinline
1494ev_io_start (EV_P_ ev_io *w) 1696ev_io_start (EV_P_ ev_io *w)
1495{ 1697{
1496 int fd = w->fd; 1698 int fd = w->fd;
1497 1699
1498 if (expect_false (ev_is_active (w))) 1700 if (expect_false (ev_is_active (w)))
1500 1702
1501 assert (("ev_io_start called with negative fd", fd >= 0)); 1703 assert (("ev_io_start called with negative fd", fd >= 0));
1502 1704
1503 ev_start (EV_A_ (W)w, 1); 1705 ev_start (EV_A_ (W)w, 1);
1504 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1706 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1505 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1707 wlist_add (&anfds[fd].head, (WL)w);
1506 1708
1507 fd_change (EV_A_ fd); 1709 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1710 w->events &= ~EV_IOFDSET;
1508} 1711}
1509 1712
1510void 1713void noinline
1511ev_io_stop (EV_P_ ev_io *w) 1714ev_io_stop (EV_P_ ev_io *w)
1512{ 1715{
1513 ev_clear_pending (EV_A_ (W)w); 1716 clear_pending (EV_A_ (W)w);
1514 if (expect_false (!ev_is_active (w))) 1717 if (expect_false (!ev_is_active (w)))
1515 return; 1718 return;
1516 1719
1517 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1720 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1518 1721
1519 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1722 wlist_del (&anfds[w->fd].head, (WL)w);
1520 ev_stop (EV_A_ (W)w); 1723 ev_stop (EV_A_ (W)w);
1521 1724
1522 fd_change (EV_A_ w->fd); 1725 fd_change (EV_A_ w->fd, 1);
1523} 1726}
1524 1727
1525void 1728void noinline
1526ev_timer_start (EV_P_ ev_timer *w) 1729ev_timer_start (EV_P_ ev_timer *w)
1527{ 1730{
1528 if (expect_false (ev_is_active (w))) 1731 if (expect_false (ev_is_active (w)))
1529 return; 1732 return;
1530 1733
1531 ((WT)w)->at += mn_now; 1734 ((WT)w)->at += mn_now;
1532 1735
1533 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1736 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1534 1737
1535 ev_start (EV_A_ (W)w, ++timercnt); 1738 ev_start (EV_A_ (W)w, ++timercnt);
1536 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1739 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1537 timers [timercnt - 1] = w; 1740 timers [timercnt - 1] = (WT)w;
1538 upheap ((WT *)timers, timercnt - 1); 1741 upheap (timers, timercnt - 1);
1539 1742
1540 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1743 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1541} 1744}
1542 1745
1543void 1746void noinline
1544ev_timer_stop (EV_P_ ev_timer *w) 1747ev_timer_stop (EV_P_ ev_timer *w)
1545{ 1748{
1546 ev_clear_pending (EV_A_ (W)w); 1749 clear_pending (EV_A_ (W)w);
1547 if (expect_false (!ev_is_active (w))) 1750 if (expect_false (!ev_is_active (w)))
1548 return; 1751 return;
1549 1752
1550 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1753 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1551 1754
1552 { 1755 {
1553 int active = ((W)w)->active; 1756 int active = ((W)w)->active;
1554 1757
1555 if (expect_true (--active < --timercnt)) 1758 if (expect_true (--active < --timercnt))
1556 { 1759 {
1557 timers [active] = timers [timercnt]; 1760 timers [active] = timers [timercnt];
1558 adjustheap ((WT *)timers, timercnt, active); 1761 adjustheap (timers, timercnt, active);
1559 } 1762 }
1560 } 1763 }
1561 1764
1562 ((WT)w)->at -= mn_now; 1765 ((WT)w)->at -= mn_now;
1563 1766
1564 ev_stop (EV_A_ (W)w); 1767 ev_stop (EV_A_ (W)w);
1565} 1768}
1566 1769
1567void 1770void noinline
1568ev_timer_again (EV_P_ ev_timer *w) 1771ev_timer_again (EV_P_ ev_timer *w)
1569{ 1772{
1570 if (ev_is_active (w)) 1773 if (ev_is_active (w))
1571 { 1774 {
1572 if (w->repeat) 1775 if (w->repeat)
1573 { 1776 {
1574 ((WT)w)->at = mn_now + w->repeat; 1777 ((WT)w)->at = mn_now + w->repeat;
1575 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1778 adjustheap (timers, timercnt, ((W)w)->active - 1);
1576 } 1779 }
1577 else 1780 else
1578 ev_timer_stop (EV_A_ w); 1781 ev_timer_stop (EV_A_ w);
1579 } 1782 }
1580 else if (w->repeat) 1783 else if (w->repeat)
1583 ev_timer_start (EV_A_ w); 1786 ev_timer_start (EV_A_ w);
1584 } 1787 }
1585} 1788}
1586 1789
1587#if EV_PERIODIC_ENABLE 1790#if EV_PERIODIC_ENABLE
1588void 1791void noinline
1589ev_periodic_start (EV_P_ ev_periodic *w) 1792ev_periodic_start (EV_P_ ev_periodic *w)
1590{ 1793{
1591 if (expect_false (ev_is_active (w))) 1794 if (expect_false (ev_is_active (w)))
1592 return; 1795 return;
1593 1796
1595 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1798 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1596 else if (w->interval) 1799 else if (w->interval)
1597 { 1800 {
1598 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1801 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1599 /* this formula differs from the one in periodic_reify because we do not always round up */ 1802 /* this formula differs from the one in periodic_reify because we do not always round up */
1600 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1803 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1601 } 1804 }
1805 else
1806 ((WT)w)->at = w->offset;
1602 1807
1603 ev_start (EV_A_ (W)w, ++periodiccnt); 1808 ev_start (EV_A_ (W)w, ++periodiccnt);
1604 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1809 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1605 periodics [periodiccnt - 1] = w; 1810 periodics [periodiccnt - 1] = (WT)w;
1606 upheap ((WT *)periodics, periodiccnt - 1); 1811 upheap (periodics, periodiccnt - 1);
1607 1812
1608 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1813 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1609} 1814}
1610 1815
1611void 1816void noinline
1612ev_periodic_stop (EV_P_ ev_periodic *w) 1817ev_periodic_stop (EV_P_ ev_periodic *w)
1613{ 1818{
1614 ev_clear_pending (EV_A_ (W)w); 1819 clear_pending (EV_A_ (W)w);
1615 if (expect_false (!ev_is_active (w))) 1820 if (expect_false (!ev_is_active (w)))
1616 return; 1821 return;
1617 1822
1618 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1823 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1619 1824
1620 { 1825 {
1621 int active = ((W)w)->active; 1826 int active = ((W)w)->active;
1622 1827
1623 if (expect_true (--active < --periodiccnt)) 1828 if (expect_true (--active < --periodiccnt))
1624 { 1829 {
1625 periodics [active] = periodics [periodiccnt]; 1830 periodics [active] = periodics [periodiccnt];
1626 adjustheap ((WT *)periodics, periodiccnt, active); 1831 adjustheap (periodics, periodiccnt, active);
1627 } 1832 }
1628 } 1833 }
1629 1834
1630 ev_stop (EV_A_ (W)w); 1835 ev_stop (EV_A_ (W)w);
1631} 1836}
1632 1837
1633void 1838void noinline
1634ev_periodic_again (EV_P_ ev_periodic *w) 1839ev_periodic_again (EV_P_ ev_periodic *w)
1635{ 1840{
1636 /* TODO: use adjustheap and recalculation */ 1841 /* TODO: use adjustheap and recalculation */
1637 ev_periodic_stop (EV_A_ w); 1842 ev_periodic_stop (EV_A_ w);
1638 ev_periodic_start (EV_A_ w); 1843 ev_periodic_start (EV_A_ w);
1641 1846
1642#ifndef SA_RESTART 1847#ifndef SA_RESTART
1643# define SA_RESTART 0 1848# define SA_RESTART 0
1644#endif 1849#endif
1645 1850
1646void 1851void noinline
1647ev_signal_start (EV_P_ ev_signal *w) 1852ev_signal_start (EV_P_ ev_signal *w)
1648{ 1853{
1649#if EV_MULTIPLICITY 1854#if EV_MULTIPLICITY
1650 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1855 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1651#endif 1856#endif
1652 if (expect_false (ev_is_active (w))) 1857 if (expect_false (ev_is_active (w)))
1653 return; 1858 return;
1654 1859
1655 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1860 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1656 1861
1862 {
1863#ifndef _WIN32
1864 sigset_t full, prev;
1865 sigfillset (&full);
1866 sigprocmask (SIG_SETMASK, &full, &prev);
1867#endif
1868
1869 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1870
1871#ifndef _WIN32
1872 sigprocmask (SIG_SETMASK, &prev, 0);
1873#endif
1874 }
1875
1657 ev_start (EV_A_ (W)w, 1); 1876 ev_start (EV_A_ (W)w, 1);
1658 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1659 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1877 wlist_add (&signals [w->signum - 1].head, (WL)w);
1660 1878
1661 if (!((WL)w)->next) 1879 if (!((WL)w)->next)
1662 { 1880 {
1663#if _WIN32 1881#if _WIN32
1664 signal (w->signum, sighandler); 1882 signal (w->signum, sighandler);
1670 sigaction (w->signum, &sa, 0); 1888 sigaction (w->signum, &sa, 0);
1671#endif 1889#endif
1672 } 1890 }
1673} 1891}
1674 1892
1675void 1893void noinline
1676ev_signal_stop (EV_P_ ev_signal *w) 1894ev_signal_stop (EV_P_ ev_signal *w)
1677{ 1895{
1678 ev_clear_pending (EV_A_ (W)w); 1896 clear_pending (EV_A_ (W)w);
1679 if (expect_false (!ev_is_active (w))) 1897 if (expect_false (!ev_is_active (w)))
1680 return; 1898 return;
1681 1899
1682 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1900 wlist_del (&signals [w->signum - 1].head, (WL)w);
1683 ev_stop (EV_A_ (W)w); 1901 ev_stop (EV_A_ (W)w);
1684 1902
1685 if (!signals [w->signum - 1].head) 1903 if (!signals [w->signum - 1].head)
1686 signal (w->signum, SIG_DFL); 1904 signal (w->signum, SIG_DFL);
1687} 1905}
1694#endif 1912#endif
1695 if (expect_false (ev_is_active (w))) 1913 if (expect_false (ev_is_active (w)))
1696 return; 1914 return;
1697 1915
1698 ev_start (EV_A_ (W)w, 1); 1916 ev_start (EV_A_ (W)w, 1);
1699 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1917 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1700} 1918}
1701 1919
1702void 1920void
1703ev_child_stop (EV_P_ ev_child *w) 1921ev_child_stop (EV_P_ ev_child *w)
1704{ 1922{
1705 ev_clear_pending (EV_A_ (W)w); 1923 clear_pending (EV_A_ (W)w);
1706 if (expect_false (!ev_is_active (w))) 1924 if (expect_false (!ev_is_active (w)))
1707 return; 1925 return;
1708 1926
1709 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1927 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1710 ev_stop (EV_A_ (W)w); 1928 ev_stop (EV_A_ (W)w);
1711} 1929}
1712 1930
1713#if EV_STAT_ENABLE 1931#if EV_STAT_ENABLE
1714 1932
1718# endif 1936# endif
1719 1937
1720#define DEF_STAT_INTERVAL 5.0074891 1938#define DEF_STAT_INTERVAL 5.0074891
1721#define MIN_STAT_INTERVAL 0.1074891 1939#define MIN_STAT_INTERVAL 0.1074891
1722 1940
1723void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 1941static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1724 1942
1725#if EV_USE_INOTIFY 1943#if EV_USE_INOTIFY
1726# define EV_INOTIFY_BUFSIZE 8192 1944# define EV_INOTIFY_BUFSIZE 8192
1727 1945
1728static void noinline 1946static void noinline
1879 w->attr.st_nlink = 0; 2097 w->attr.st_nlink = 0;
1880 else if (!w->attr.st_nlink) 2098 else if (!w->attr.st_nlink)
1881 w->attr.st_nlink = 1; 2099 w->attr.st_nlink = 1;
1882} 2100}
1883 2101
1884void noinline 2102static void noinline
1885stat_timer_cb (EV_P_ ev_timer *w_, int revents) 2103stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1886{ 2104{
1887 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 2105 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1888 2106
1889 /* we copy this here each the time so that */ 2107 /* we copy this here each the time so that */
1890 /* prev has the old value when the callback gets invoked */ 2108 /* prev has the old value when the callback gets invoked */
1891 w->prev = w->attr; 2109 w->prev = w->attr;
1892 ev_stat_stat (EV_A_ w); 2110 ev_stat_stat (EV_A_ w);
1893 2111
1894 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 2112 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2113 if (
2114 w->prev.st_dev != w->attr.st_dev
2115 || w->prev.st_ino != w->attr.st_ino
2116 || w->prev.st_mode != w->attr.st_mode
2117 || w->prev.st_nlink != w->attr.st_nlink
2118 || w->prev.st_uid != w->attr.st_uid
2119 || w->prev.st_gid != w->attr.st_gid
2120 || w->prev.st_rdev != w->attr.st_rdev
2121 || w->prev.st_size != w->attr.st_size
2122 || w->prev.st_atime != w->attr.st_atime
2123 || w->prev.st_mtime != w->attr.st_mtime
2124 || w->prev.st_ctime != w->attr.st_ctime
1895 { 2125 ) {
1896 #if EV_USE_INOTIFY 2126 #if EV_USE_INOTIFY
1897 infy_del (EV_A_ w); 2127 infy_del (EV_A_ w);
1898 infy_add (EV_A_ w); 2128 infy_add (EV_A_ w);
1899 ev_stat_stat (EV_A_ w); /* avoid race... */ 2129 ev_stat_stat (EV_A_ w); /* avoid race... */
1900 #endif 2130 #endif
1934} 2164}
1935 2165
1936void 2166void
1937ev_stat_stop (EV_P_ ev_stat *w) 2167ev_stat_stop (EV_P_ ev_stat *w)
1938{ 2168{
1939 ev_clear_pending (EV_A_ (W)w); 2169 clear_pending (EV_A_ (W)w);
1940 if (expect_false (!ev_is_active (w))) 2170 if (expect_false (!ev_is_active (w)))
1941 return; 2171 return;
1942 2172
1943#if EV_USE_INOTIFY 2173#if EV_USE_INOTIFY
1944 infy_del (EV_A_ w); 2174 infy_del (EV_A_ w);
1947 2177
1948 ev_stop (EV_A_ (W)w); 2178 ev_stop (EV_A_ (W)w);
1949} 2179}
1950#endif 2180#endif
1951 2181
2182#if EV_IDLE_ENABLE
1952void 2183void
1953ev_idle_start (EV_P_ ev_idle *w) 2184ev_idle_start (EV_P_ ev_idle *w)
1954{ 2185{
1955 if (expect_false (ev_is_active (w))) 2186 if (expect_false (ev_is_active (w)))
1956 return; 2187 return;
1957 2188
2189 pri_adjust (EV_A_ (W)w);
2190
2191 {
2192 int active = ++idlecnt [ABSPRI (w)];
2193
2194 ++idleall;
1958 ev_start (EV_A_ (W)w, ++idlecnt); 2195 ev_start (EV_A_ (W)w, active);
2196
1959 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2197 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1960 idles [idlecnt - 1] = w; 2198 idles [ABSPRI (w)][active - 1] = w;
2199 }
1961} 2200}
1962 2201
1963void 2202void
1964ev_idle_stop (EV_P_ ev_idle *w) 2203ev_idle_stop (EV_P_ ev_idle *w)
1965{ 2204{
1966 ev_clear_pending (EV_A_ (W)w); 2205 clear_pending (EV_A_ (W)w);
1967 if (expect_false (!ev_is_active (w))) 2206 if (expect_false (!ev_is_active (w)))
1968 return; 2207 return;
1969 2208
1970 { 2209 {
1971 int active = ((W)w)->active; 2210 int active = ((W)w)->active;
1972 idles [active - 1] = idles [--idlecnt]; 2211
2212 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1973 ((W)idles [active - 1])->active = active; 2213 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2214
2215 ev_stop (EV_A_ (W)w);
2216 --idleall;
1974 } 2217 }
1975
1976 ev_stop (EV_A_ (W)w);
1977} 2218}
2219#endif
1978 2220
1979void 2221void
1980ev_prepare_start (EV_P_ ev_prepare *w) 2222ev_prepare_start (EV_P_ ev_prepare *w)
1981{ 2223{
1982 if (expect_false (ev_is_active (w))) 2224 if (expect_false (ev_is_active (w)))
1988} 2230}
1989 2231
1990void 2232void
1991ev_prepare_stop (EV_P_ ev_prepare *w) 2233ev_prepare_stop (EV_P_ ev_prepare *w)
1992{ 2234{
1993 ev_clear_pending (EV_A_ (W)w); 2235 clear_pending (EV_A_ (W)w);
1994 if (expect_false (!ev_is_active (w))) 2236 if (expect_false (!ev_is_active (w)))
1995 return; 2237 return;
1996 2238
1997 { 2239 {
1998 int active = ((W)w)->active; 2240 int active = ((W)w)->active;
2015} 2257}
2016 2258
2017void 2259void
2018ev_check_stop (EV_P_ ev_check *w) 2260ev_check_stop (EV_P_ ev_check *w)
2019{ 2261{
2020 ev_clear_pending (EV_A_ (W)w); 2262 clear_pending (EV_A_ (W)w);
2021 if (expect_false (!ev_is_active (w))) 2263 if (expect_false (!ev_is_active (w)))
2022 return; 2264 return;
2023 2265
2024 { 2266 {
2025 int active = ((W)w)->active; 2267 int active = ((W)w)->active;
2032 2274
2033#if EV_EMBED_ENABLE 2275#if EV_EMBED_ENABLE
2034void noinline 2276void noinline
2035ev_embed_sweep (EV_P_ ev_embed *w) 2277ev_embed_sweep (EV_P_ ev_embed *w)
2036{ 2278{
2037 ev_loop (w->loop, EVLOOP_NONBLOCK); 2279 ev_loop (w->other, EVLOOP_NONBLOCK);
2038} 2280}
2039 2281
2040static void 2282static void
2041embed_cb (EV_P_ ev_io *io, int revents) 2283embed_io_cb (EV_P_ ev_io *io, int revents)
2042{ 2284{
2043 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2285 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2044 2286
2045 if (ev_cb (w)) 2287 if (ev_cb (w))
2046 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2288 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2047 else 2289 else
2048 ev_embed_sweep (loop, w); 2290 ev_loop (w->other, EVLOOP_NONBLOCK);
2049} 2291}
2292
2293static void
2294embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2295{
2296 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2297
2298 {
2299 struct ev_loop *loop = w->other;
2300
2301 while (fdchangecnt)
2302 {
2303 fd_reify (EV_A);
2304 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2305 }
2306 }
2307}
2308
2309#if 0
2310static void
2311embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2312{
2313 ev_idle_stop (EV_A_ idle);
2314}
2315#endif
2050 2316
2051void 2317void
2052ev_embed_start (EV_P_ ev_embed *w) 2318ev_embed_start (EV_P_ ev_embed *w)
2053{ 2319{
2054 if (expect_false (ev_is_active (w))) 2320 if (expect_false (ev_is_active (w)))
2055 return; 2321 return;
2056 2322
2057 { 2323 {
2058 struct ev_loop *loop = w->loop; 2324 struct ev_loop *loop = w->other;
2059 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2325 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2060 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2326 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2061 } 2327 }
2062 2328
2063 ev_set_priority (&w->io, ev_priority (w)); 2329 ev_set_priority (&w->io, ev_priority (w));
2064 ev_io_start (EV_A_ &w->io); 2330 ev_io_start (EV_A_ &w->io);
2065 2331
2332 ev_prepare_init (&w->prepare, embed_prepare_cb);
2333 ev_set_priority (&w->prepare, EV_MINPRI);
2334 ev_prepare_start (EV_A_ &w->prepare);
2335
2336 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2337
2066 ev_start (EV_A_ (W)w, 1); 2338 ev_start (EV_A_ (W)w, 1);
2067} 2339}
2068 2340
2069void 2341void
2070ev_embed_stop (EV_P_ ev_embed *w) 2342ev_embed_stop (EV_P_ ev_embed *w)
2071{ 2343{
2072 ev_clear_pending (EV_A_ (W)w); 2344 clear_pending (EV_A_ (W)w);
2073 if (expect_false (!ev_is_active (w))) 2345 if (expect_false (!ev_is_active (w)))
2074 return; 2346 return;
2075 2347
2076 ev_io_stop (EV_A_ &w->io); 2348 ev_io_stop (EV_A_ &w->io);
2349 ev_prepare_stop (EV_A_ &w->prepare);
2077 2350
2078 ev_stop (EV_A_ (W)w); 2351 ev_stop (EV_A_ (W)w);
2079} 2352}
2080#endif 2353#endif
2081 2354
2092} 2365}
2093 2366
2094void 2367void
2095ev_fork_stop (EV_P_ ev_fork *w) 2368ev_fork_stop (EV_P_ ev_fork *w)
2096{ 2369{
2097 ev_clear_pending (EV_A_ (W)w); 2370 clear_pending (EV_A_ (W)w);
2098 if (expect_false (!ev_is_active (w))) 2371 if (expect_false (!ev_is_active (w)))
2099 return; 2372 return;
2100 2373
2101 { 2374 {
2102 int active = ((W)w)->active; 2375 int active = ((W)w)->active;
2170 ev_timer_set (&once->to, timeout, 0.); 2443 ev_timer_set (&once->to, timeout, 0.);
2171 ev_timer_start (EV_A_ &once->to); 2444 ev_timer_start (EV_A_ &once->to);
2172 } 2445 }
2173} 2446}
2174 2447
2448#if EV_MULTIPLICITY
2449 #include "ev_wrap.h"
2450#endif
2451
2175#ifdef __cplusplus 2452#ifdef __cplusplus
2176} 2453}
2177#endif 2454#endif
2178 2455

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines