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

Comparing libev/ev.c (file contents):
Revision 1.164 by root, Fri Dec 7 16:44:10 2007 UTC vs.
Revision 1.206 by root, Fri Jan 25 15:45:08 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)w)->priority - EV_MINPRI) 284#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247 285
248#define EMPTY /* required for microsofts broken pseudo-c compiler */ 286#define EMPTY /* required for microsofts broken pseudo-c compiler */
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
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
401int inline_size 470int inline_size
402array_nextsize (int elem, int cur, int cnt) 471array_nextsize (int elem, int cur, int cnt)
403{ 472{
404 int ncur = cur + 1; 473 int ncur = cur + 1;
405 474
417 } 486 }
418 487
419 return ncur; 488 return ncur;
420} 489}
421 490
422inline_speed void * 491static noinline void *
423array_realloc (int elem, void *base, int *cur, int cnt) 492array_realloc (int elem, void *base, int *cur, int cnt)
424{ 493{
425 *cur = array_nextsize (elem, *cur, cnt); 494 *cur = array_nextsize (elem, *cur, cnt);
426 return ev_realloc (base, elem * *cur); 495 return ev_realloc (base, elem * *cur);
427} 496}
452 521
453void noinline 522void noinline
454ev_feed_event (EV_P_ void *w, int revents) 523ev_feed_event (EV_P_ void *w, int revents)
455{ 524{
456 W w_ = (W)w; 525 W w_ = (W)w;
526 int pri = ABSPRI (w_);
457 527
458 if (expect_false (w_->pending)) 528 if (expect_false (w_->pending))
529 pendings [pri][w_->pending - 1].events |= revents;
530 else
459 { 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_;
460 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 535 pendings [pri][w_->pending - 1].events = revents;
461 return;
462 } 536 }
463
464 w_->pending = ++pendingcnt [ABSPRI (w_)];
465 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
466 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
467 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
468} 537}
469 538
470void inline_size 539void inline_speed
471queue_events (EV_P_ W *events, int eventcnt, int type) 540queue_events (EV_P_ W *events, int eventcnt, int type)
472{ 541{
473 int i; 542 int i;
474 543
475 for (i = 0; i < eventcnt; ++i) 544 for (i = 0; i < eventcnt; ++i)
507} 576}
508 577
509void 578void
510ev_feed_fd_event (EV_P_ int fd, int revents) 579ev_feed_fd_event (EV_P_ int fd, int revents)
511{ 580{
581 if (fd >= 0 && fd < anfdmax)
512 fd_event (EV_A_ fd, revents); 582 fd_event (EV_A_ fd, revents);
513} 583}
514 584
515void inline_size 585void inline_size
516fd_reify (EV_P) 586fd_reify (EV_P)
517{ 587{
521 { 591 {
522 int fd = fdchanges [i]; 592 int fd = fdchanges [i];
523 ANFD *anfd = anfds + fd; 593 ANFD *anfd = anfds + fd;
524 ev_io *w; 594 ev_io *w;
525 595
526 int events = 0; 596 unsigned char events = 0;
527 597
528 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)
529 events |= w->events; 599 events |= (unsigned char)w->events;
530 600
531#if EV_SELECT_IS_WINSOCKET 601#if EV_SELECT_IS_WINSOCKET
532 if (events) 602 if (events)
533 { 603 {
534 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
535 anfd->handle = _get_osfhandle (fd); 608 anfd->handle = _get_osfhandle (fd);
609 #endif
536 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));
537 } 611 }
538#endif 612#endif
539 613
614 {
615 unsigned char o_events = anfd->events;
616 unsigned char o_reify = anfd->reify;
617
540 anfd->reify = 0; 618 anfd->reify = 0;
541
542 backend_modify (EV_A_ fd, anfd->events, events);
543 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 }
544 } 624 }
545 625
546 fdchangecnt = 0; 626 fdchangecnt = 0;
547} 627}
548 628
549void inline_size 629void inline_size
550fd_change (EV_P_ int fd) 630fd_change (EV_P_ int fd, int flags)
551{ 631{
552 if (expect_false (anfds [fd].reify)) 632 unsigned char reify = anfds [fd].reify;
553 return;
554
555 anfds [fd].reify = 1; 633 anfds [fd].reify |= flags;
556 634
635 if (expect_true (!reify))
636 {
557 ++fdchangecnt; 637 ++fdchangecnt;
558 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 638 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
559 fdchanges [fdchangecnt - 1] = fd; 639 fdchanges [fdchangecnt - 1] = fd;
640 }
560} 641}
561 642
562void inline_speed 643void inline_speed
563fd_kill (EV_P_ int fd) 644fd_kill (EV_P_ int fd)
564{ 645{
615 696
616 for (fd = 0; fd < anfdmax; ++fd) 697 for (fd = 0; fd < anfdmax; ++fd)
617 if (anfds [fd].events) 698 if (anfds [fd].events)
618 { 699 {
619 anfds [fd].events = 0; 700 anfds [fd].events = 0;
620 fd_change (EV_A_ fd); 701 fd_change (EV_A_ fd, EV_IOFDSET | 1);
621 } 702 }
622} 703}
623 704
624/*****************************************************************************/ 705/*****************************************************************************/
625 706
626void inline_speed 707void inline_speed
627upheap (WT *heap, int k) 708upheap (WT *heap, int k)
628{ 709{
629 WT w = heap [k]; 710 WT w = heap [k];
630 711
631 while (k && heap [k >> 1]->at > w->at) 712 while (k)
632 { 713 {
714 int p = (k - 1) >> 1;
715
716 if (heap [p]->at <= w->at)
717 break;
718
633 heap [k] = heap [k >> 1]; 719 heap [k] = heap [p];
634 ((W)heap [k])->active = k + 1; 720 ((W)heap [k])->active = k + 1;
635 k >>= 1; 721 k = p;
636 } 722 }
637 723
638 heap [k] = w; 724 heap [k] = w;
639 ((W)heap [k])->active = k + 1; 725 ((W)heap [k])->active = k + 1;
640
641} 726}
642 727
643void inline_speed 728void inline_speed
644downheap (WT *heap, int N, int k) 729downheap (WT *heap, int N, int k)
645{ 730{
646 WT w = heap [k]; 731 WT w = heap [k];
647 732
648 while (k < (N >> 1)) 733 for (;;)
649 { 734 {
650 int j = k << 1; 735 int c = (k << 1) + 1;
651 736
652 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 737 if (c >= N)
653 ++j;
654
655 if (w->at <= heap [j]->at)
656 break; 738 break;
657 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
658 heap [k] = heap [j]; 746 heap [k] = heap [c];
659 ((W)heap [k])->active = k + 1; 747 ((W)heap [k])->active = k + 1;
748
660 k = j; 749 k = c;
661 } 750 }
662 751
663 heap [k] = w; 752 heap [k] = w;
664 ((W)heap [k])->active = k + 1; 753 ((W)heap [k])->active = k + 1;
665} 754}
747 for (signum = signalmax; signum--; ) 836 for (signum = signalmax; signum--; )
748 if (signals [signum].gotsig) 837 if (signals [signum].gotsig)
749 ev_feed_signal_event (EV_A_ signum + 1); 838 ev_feed_signal_event (EV_A_ signum + 1);
750} 839}
751 840
752void inline_size 841void inline_speed
753fd_intern (int fd) 842fd_intern (int fd)
754{ 843{
755#ifdef _WIN32 844#ifdef _WIN32
756 int arg = 1; 845 int arg = 1;
757 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 846 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
772 ev_unref (EV_A); /* child watcher should not keep loop alive */ 861 ev_unref (EV_A); /* child watcher should not keep loop alive */
773} 862}
774 863
775/*****************************************************************************/ 864/*****************************************************************************/
776 865
777static ev_child *childs [EV_PID_HASHSIZE]; 866static WL childs [EV_PID_HASHSIZE];
778 867
779#ifndef _WIN32 868#ifndef _WIN32
780 869
781static ev_signal childev; 870static ev_signal childev;
871
872#ifndef WIFCONTINUED
873# define WIFCONTINUED(status) 0
874#endif
782 875
783void inline_speed 876void inline_speed
784child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 877child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
785{ 878{
786 ev_child *w; 879 ev_child *w;
880 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
787 881
788 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 882 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
883 {
789 if (w->pid == pid || !w->pid) 884 if ((w->pid == pid || !w->pid)
885 && (!traced || (w->flags & 1)))
790 { 886 {
791 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 887 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
792 w->rpid = pid; 888 w->rpid = pid;
793 w->rstatus = status; 889 w->rstatus = status;
794 ev_feed_event (EV_A_ (W)w, EV_CHILD); 890 ev_feed_event (EV_A_ (W)w, EV_CHILD);
795 } 891 }
892 }
796} 893}
797 894
798#ifndef WCONTINUED 895#ifndef WCONTINUED
799# define WCONTINUED 0 896# define WCONTINUED 0
800#endif 897#endif
897} 994}
898 995
899unsigned int 996unsigned int
900ev_embeddable_backends (void) 997ev_embeddable_backends (void)
901{ 998{
902 return EVBACKEND_EPOLL 999 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
903 | EVBACKEND_KQUEUE 1000
904 | EVBACKEND_PORT; 1001 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1002 /* please fix it and tell me how to detect the fix */
1003 flags &= ~EVBACKEND_EPOLL;
1004
1005 return flags;
905} 1006}
906 1007
907unsigned int 1008unsigned int
908ev_backend (EV_P) 1009ev_backend (EV_P)
909{ 1010{
912 1013
913unsigned int 1014unsigned int
914ev_loop_count (EV_P) 1015ev_loop_count (EV_P)
915{ 1016{
916 return loop_count; 1017 return loop_count;
1018}
1019
1020void
1021ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1022{
1023 io_blocktime = interval;
1024}
1025
1026void
1027ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1028{
1029 timeout_blocktime = interval;
917} 1030}
918 1031
919static void noinline 1032static void noinline
920loop_init (EV_P_ unsigned int flags) 1033loop_init (EV_P_ unsigned int flags)
921{ 1034{
932 ev_rt_now = ev_time (); 1045 ev_rt_now = ev_time ();
933 mn_now = get_clock (); 1046 mn_now = get_clock ();
934 now_floor = mn_now; 1047 now_floor = mn_now;
935 rtmn_diff = ev_rt_now - mn_now; 1048 rtmn_diff = ev_rt_now - mn_now;
936 1049
1050 io_blocktime = 0.;
1051 timeout_blocktime = 0.;
1052
937 /* pid check not overridable via env */ 1053 /* pid check not overridable via env */
938#ifndef _WIN32 1054#ifndef _WIN32
939 if (flags & EVFLAG_FORKCHECK) 1055 if (flags & EVFLAG_FORKCHECK)
940 curpid = getpid (); 1056 curpid = getpid ();
941#endif 1057#endif
1009 array_free (pending, [i]); 1125 array_free (pending, [i]);
1010#if EV_IDLE_ENABLE 1126#if EV_IDLE_ENABLE
1011 array_free (idle, [i]); 1127 array_free (idle, [i]);
1012#endif 1128#endif
1013 } 1129 }
1130
1131 ev_free (anfds); anfdmax = 0;
1014 1132
1015 /* have to use the microsoft-never-gets-it-right macro */ 1133 /* have to use the microsoft-never-gets-it-right macro */
1016 array_free (fdchange, EMPTY); 1134 array_free (fdchange, EMPTY);
1017 array_free (timer, EMPTY); 1135 array_free (timer, EMPTY);
1018#if EV_PERIODIC_ENABLE 1136#if EV_PERIODIC_ENABLE
1019 array_free (periodic, EMPTY); 1137 array_free (periodic, EMPTY);
1020#endif 1138#endif
1139#if EV_FORK_ENABLE
1140 array_free (fork, EMPTY);
1141#endif
1021 array_free (prepare, EMPTY); 1142 array_free (prepare, EMPTY);
1022 array_free (check, EMPTY); 1143 array_free (check, EMPTY);
1023 1144
1024 backend = 0; 1145 backend = 0;
1025} 1146}
1053 1174
1054 while (pipe (sigpipe)) 1175 while (pipe (sigpipe))
1055 syserr ("(libev) error creating pipe"); 1176 syserr ("(libev) error creating pipe");
1056 1177
1057 siginit (EV_A); 1178 siginit (EV_A);
1179 sigcb (EV_A_ &sigev, EV_READ);
1058 } 1180 }
1059 1181
1060 postfork = 0; 1182 postfork = 0;
1061} 1183}
1062 1184
1084} 1206}
1085 1207
1086void 1208void
1087ev_loop_fork (EV_P) 1209ev_loop_fork (EV_P)
1088{ 1210{
1089 postfork = 1; 1211 postfork = 1; /* must be in line with ev_default_fork */
1090} 1212}
1091 1213
1092#endif 1214#endif
1093 1215
1094#if EV_MULTIPLICITY 1216#if EV_MULTIPLICITY
1158#if EV_MULTIPLICITY 1280#if EV_MULTIPLICITY
1159 struct ev_loop *loop = ev_default_loop_ptr; 1281 struct ev_loop *loop = ev_default_loop_ptr;
1160#endif 1282#endif
1161 1283
1162 if (backend) 1284 if (backend)
1163 postfork = 1; 1285 postfork = 1; /* must be in line with ev_loop_fork */
1164} 1286}
1165 1287
1166/*****************************************************************************/ 1288/*****************************************************************************/
1289
1290void
1291ev_invoke (EV_P_ void *w, int revents)
1292{
1293 EV_CB_INVOKE ((W)w, revents);
1294}
1167 1295
1168void inline_speed 1296void inline_speed
1169call_pending (EV_P) 1297call_pending (EV_P)
1170{ 1298{
1171 int pri; 1299 int pri;
1188void inline_size 1316void inline_size
1189timers_reify (EV_P) 1317timers_reify (EV_P)
1190{ 1318{
1191 while (timercnt && ((WT)timers [0])->at <= mn_now) 1319 while (timercnt && ((WT)timers [0])->at <= mn_now)
1192 { 1320 {
1193 ev_timer *w = timers [0]; 1321 ev_timer *w = (ev_timer *)timers [0];
1194 1322
1195 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1323 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1196 1324
1197 /* first reschedule or stop timer */ 1325 /* first reschedule or stop timer */
1198 if (w->repeat) 1326 if (w->repeat)
1201 1329
1202 ((WT)w)->at += w->repeat; 1330 ((WT)w)->at += w->repeat;
1203 if (((WT)w)->at < mn_now) 1331 if (((WT)w)->at < mn_now)
1204 ((WT)w)->at = mn_now; 1332 ((WT)w)->at = mn_now;
1205 1333
1206 downheap ((WT *)timers, timercnt, 0); 1334 downheap (timers, timercnt, 0);
1207 } 1335 }
1208 else 1336 else
1209 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1337 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1210 1338
1211 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1339 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1216void inline_size 1344void inline_size
1217periodics_reify (EV_P) 1345periodics_reify (EV_P)
1218{ 1346{
1219 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1347 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1220 { 1348 {
1221 ev_periodic *w = periodics [0]; 1349 ev_periodic *w = (ev_periodic *)periodics [0];
1222 1350
1223 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1351 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1224 1352
1225 /* first reschedule or stop timer */ 1353 /* first reschedule or stop timer */
1226 if (w->reschedule_cb) 1354 if (w->reschedule_cb)
1227 { 1355 {
1228 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1356 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1229 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1357 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1230 downheap ((WT *)periodics, periodiccnt, 0); 1358 downheap (periodics, periodiccnt, 0);
1231 } 1359 }
1232 else if (w->interval) 1360 else if (w->interval)
1233 { 1361 {
1234 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1362 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1363 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1235 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1364 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1236 downheap ((WT *)periodics, periodiccnt, 0); 1365 downheap (periodics, periodiccnt, 0);
1237 } 1366 }
1238 else 1367 else
1239 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1368 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1240 1369
1241 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1370 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1248 int i; 1377 int i;
1249 1378
1250 /* adjust periodics after time jump */ 1379 /* adjust periodics after time jump */
1251 for (i = 0; i < periodiccnt; ++i) 1380 for (i = 0; i < periodiccnt; ++i)
1252 { 1381 {
1253 ev_periodic *w = periodics [i]; 1382 ev_periodic *w = (ev_periodic *)periodics [i];
1254 1383
1255 if (w->reschedule_cb) 1384 if (w->reschedule_cb)
1256 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1385 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1257 else if (w->interval) 1386 else if (w->interval)
1258 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1387 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1259 } 1388 }
1260 1389
1261 /* now rebuild the heap */ 1390 /* now rebuild the heap */
1262 for (i = periodiccnt >> 1; i--; ) 1391 for (i = periodiccnt >> 1; i--; )
1263 downheap ((WT *)periodics, periodiccnt, i); 1392 downheap (periodics, periodiccnt, i);
1264} 1393}
1265#endif 1394#endif
1266 1395
1267#if EV_IDLE_ENABLE 1396#if EV_IDLE_ENABLE
1268void inline_size 1397void inline_size
1269idle_reify (EV_P) 1398idle_reify (EV_P)
1270{ 1399{
1271 if (expect_false (!idleall)) 1400 if (expect_false (idleall))
1272 { 1401 {
1273 int pri; 1402 int pri;
1274 1403
1275 for (pri = NUMPRI; pri--; ) 1404 for (pri = NUMPRI; pri--; )
1276 { 1405 {
1285 } 1414 }
1286 } 1415 }
1287} 1416}
1288#endif 1417#endif
1289 1418
1290int inline_size 1419void inline_speed
1291time_update_monotonic (EV_P) 1420time_update (EV_P_ ev_tstamp max_block)
1292{ 1421{
1422 int i;
1423
1424#if EV_USE_MONOTONIC
1425 if (expect_true (have_monotonic))
1426 {
1427 ev_tstamp odiff = rtmn_diff;
1428
1293 mn_now = get_clock (); 1429 mn_now = get_clock ();
1294 1430
1431 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1432 /* interpolate in the meantime */
1295 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1433 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1296 { 1434 {
1297 ev_rt_now = rtmn_diff + mn_now; 1435 ev_rt_now = rtmn_diff + mn_now;
1298 return 0; 1436 return;
1299 } 1437 }
1300 else 1438
1301 {
1302 now_floor = mn_now; 1439 now_floor = mn_now;
1303 ev_rt_now = ev_time (); 1440 ev_rt_now = ev_time ();
1304 return 1;
1305 }
1306}
1307 1441
1308void inline_size 1442 /* loop a few times, before making important decisions.
1309time_update (EV_P) 1443 * on the choice of "4": one iteration isn't enough,
1310{ 1444 * in case we get preempted during the calls to
1311 int i; 1445 * ev_time and get_clock. a second call is almost guaranteed
1312 1446 * to succeed in that case, though. and looping a few more times
1313#if EV_USE_MONOTONIC 1447 * doesn't hurt either as we only do this on time-jumps or
1314 if (expect_true (have_monotonic)) 1448 * in the unlikely event of having been preempted here.
1315 { 1449 */
1316 if (time_update_monotonic (EV_A)) 1450 for (i = 4; --i; )
1317 { 1451 {
1318 ev_tstamp odiff = rtmn_diff;
1319
1320 /* loop a few times, before making important decisions.
1321 * on the choice of "4": one iteration isn't enough,
1322 * in case we get preempted during the calls to
1323 * ev_time and get_clock. a second call is almost guaranteed
1324 * to succeed in that case, though. and looping a few more times
1325 * doesn't hurt either as we only do this on time-jumps or
1326 * in the unlikely event of having been preempted here.
1327 */
1328 for (i = 4; --i; )
1329 {
1330 rtmn_diff = ev_rt_now - mn_now; 1452 rtmn_diff = ev_rt_now - mn_now;
1331 1453
1332 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1454 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1333 return; /* all is well */ 1455 return; /* all is well */
1334 1456
1335 ev_rt_now = ev_time (); 1457 ev_rt_now = ev_time ();
1336 mn_now = get_clock (); 1458 mn_now = get_clock ();
1337 now_floor = mn_now; 1459 now_floor = mn_now;
1338 } 1460 }
1339 1461
1340# if EV_PERIODIC_ENABLE 1462# if EV_PERIODIC_ENABLE
1341 periodics_reschedule (EV_A); 1463 periodics_reschedule (EV_A);
1342# endif 1464# endif
1343 /* no timer adjustment, as the monotonic clock doesn't jump */ 1465 /* no timer adjustment, as the monotonic clock doesn't jump */
1344 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1466 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1345 }
1346 } 1467 }
1347 else 1468 else
1348#endif 1469#endif
1349 { 1470 {
1350 ev_rt_now = ev_time (); 1471 ev_rt_now = ev_time ();
1351 1472
1352 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1473 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1353 { 1474 {
1354#if EV_PERIODIC_ENABLE 1475#if EV_PERIODIC_ENABLE
1355 periodics_reschedule (EV_A); 1476 periodics_reschedule (EV_A);
1356#endif 1477#endif
1357
1358 /* adjust timers. this is easy, as the offset is the same for all of them */ 1478 /* adjust timers. this is easy, as the offset is the same for all of them */
1359 for (i = 0; i < timercnt; ++i) 1479 for (i = 0; i < timercnt; ++i)
1360 ((WT)timers [i])->at += ev_rt_now - mn_now; 1480 ((WT)timers [i])->at += ev_rt_now - mn_now;
1361 } 1481 }
1362 1482
1406 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1526 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1407 call_pending (EV_A); 1527 call_pending (EV_A);
1408 } 1528 }
1409#endif 1529#endif
1410 1530
1411 /* queue check watchers (and execute them) */ 1531 /* queue prepare watchers (and execute them) */
1412 if (expect_false (preparecnt)) 1532 if (expect_false (preparecnt))
1413 { 1533 {
1414 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1534 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1415 call_pending (EV_A); 1535 call_pending (EV_A);
1416 } 1536 }
1425 /* update fd-related kernel structures */ 1545 /* update fd-related kernel structures */
1426 fd_reify (EV_A); 1546 fd_reify (EV_A);
1427 1547
1428 /* calculate blocking time */ 1548 /* calculate blocking time */
1429 { 1549 {
1430 ev_tstamp block; 1550 ev_tstamp waittime = 0.;
1551 ev_tstamp sleeptime = 0.;
1431 1552
1432 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1553 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1433 block = 0.; /* do not block at all */
1434 else
1435 { 1554 {
1436 /* update time to cancel out callback processing overhead */ 1555 /* update time to cancel out callback processing overhead */
1437#if EV_USE_MONOTONIC
1438 if (expect_true (have_monotonic))
1439 time_update_monotonic (EV_A); 1556 time_update (EV_A_ 1e100);
1440 else
1441#endif
1442 {
1443 ev_rt_now = ev_time ();
1444 mn_now = ev_rt_now;
1445 }
1446 1557
1447 block = MAX_BLOCKTIME; 1558 waittime = MAX_BLOCKTIME;
1448 1559
1449 if (timercnt) 1560 if (timercnt)
1450 { 1561 {
1451 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1562 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1452 if (block > to) block = to; 1563 if (waittime > to) waittime = to;
1453 } 1564 }
1454 1565
1455#if EV_PERIODIC_ENABLE 1566#if EV_PERIODIC_ENABLE
1456 if (periodiccnt) 1567 if (periodiccnt)
1457 { 1568 {
1458 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1569 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1459 if (block > to) block = to; 1570 if (waittime > to) waittime = to;
1460 } 1571 }
1461#endif 1572#endif
1462 1573
1463 if (expect_false (block < 0.)) block = 0.; 1574 if (expect_false (waittime < timeout_blocktime))
1575 waittime = timeout_blocktime;
1576
1577 sleeptime = waittime - backend_fudge;
1578
1579 if (expect_true (sleeptime > io_blocktime))
1580 sleeptime = io_blocktime;
1581
1582 if (sleeptime)
1583 {
1584 ev_sleep (sleeptime);
1585 waittime -= sleeptime;
1586 }
1464 } 1587 }
1465 1588
1466 ++loop_count; 1589 ++loop_count;
1467 backend_poll (EV_A_ block); 1590 backend_poll (EV_A_ waittime);
1591
1592 /* update ev_rt_now, do magic */
1593 time_update (EV_A_ waittime + sleeptime);
1468 } 1594 }
1469
1470 /* update ev_rt_now, do magic */
1471 time_update (EV_A);
1472 1595
1473 /* queue pending timers and reschedule them */ 1596 /* queue pending timers and reschedule them */
1474 timers_reify (EV_A); /* relative timers called last */ 1597 timers_reify (EV_A); /* relative timers called last */
1475#if EV_PERIODIC_ENABLE 1598#if EV_PERIODIC_ENABLE
1476 periodics_reify (EV_A); /* absolute timers called first */ 1599 periodics_reify (EV_A); /* absolute timers called first */
1523 head = &(*head)->next; 1646 head = &(*head)->next;
1524 } 1647 }
1525} 1648}
1526 1649
1527void inline_speed 1650void inline_speed
1528ev_clear_pending (EV_P_ W w) 1651clear_pending (EV_P_ W w)
1529{ 1652{
1530 if (w->pending) 1653 if (w->pending)
1531 { 1654 {
1532 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1655 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1533 w->pending = 0; 1656 w->pending = 0;
1534 } 1657 }
1658}
1659
1660int
1661ev_clear_pending (EV_P_ void *w)
1662{
1663 W w_ = (W)w;
1664 int pending = w_->pending;
1665
1666 if (expect_true (pending))
1667 {
1668 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1669 w_->pending = 0;
1670 p->w = 0;
1671 return p->events;
1672 }
1673 else
1674 return 0;
1535} 1675}
1536 1676
1537void inline_size 1677void inline_size
1538pri_adjust (EV_P_ W w) 1678pri_adjust (EV_P_ W w)
1539{ 1679{
1558 w->active = 0; 1698 w->active = 0;
1559} 1699}
1560 1700
1561/*****************************************************************************/ 1701/*****************************************************************************/
1562 1702
1563void 1703void noinline
1564ev_io_start (EV_P_ ev_io *w) 1704ev_io_start (EV_P_ ev_io *w)
1565{ 1705{
1566 int fd = w->fd; 1706 int fd = w->fd;
1567 1707
1568 if (expect_false (ev_is_active (w))) 1708 if (expect_false (ev_is_active (w)))
1570 1710
1571 assert (("ev_io_start called with negative fd", fd >= 0)); 1711 assert (("ev_io_start called with negative fd", fd >= 0));
1572 1712
1573 ev_start (EV_A_ (W)w, 1); 1713 ev_start (EV_A_ (W)w, 1);
1574 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1714 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1575 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1715 wlist_add (&anfds[fd].head, (WL)w);
1576 1716
1577 fd_change (EV_A_ fd); 1717 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1718 w->events &= ~EV_IOFDSET;
1578} 1719}
1579 1720
1580void 1721void noinline
1581ev_io_stop (EV_P_ ev_io *w) 1722ev_io_stop (EV_P_ ev_io *w)
1582{ 1723{
1583 ev_clear_pending (EV_A_ (W)w); 1724 clear_pending (EV_A_ (W)w);
1584 if (expect_false (!ev_is_active (w))) 1725 if (expect_false (!ev_is_active (w)))
1585 return; 1726 return;
1586 1727
1587 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1728 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1588 1729
1589 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1730 wlist_del (&anfds[w->fd].head, (WL)w);
1590 ev_stop (EV_A_ (W)w); 1731 ev_stop (EV_A_ (W)w);
1591 1732
1592 fd_change (EV_A_ w->fd); 1733 fd_change (EV_A_ w->fd, 1);
1593} 1734}
1594 1735
1595void 1736void noinline
1596ev_timer_start (EV_P_ ev_timer *w) 1737ev_timer_start (EV_P_ ev_timer *w)
1597{ 1738{
1598 if (expect_false (ev_is_active (w))) 1739 if (expect_false (ev_is_active (w)))
1599 return; 1740 return;
1600 1741
1601 ((WT)w)->at += mn_now; 1742 ((WT)w)->at += mn_now;
1602 1743
1603 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1744 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1604 1745
1605 ev_start (EV_A_ (W)w, ++timercnt); 1746 ev_start (EV_A_ (W)w, ++timercnt);
1606 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1747 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1607 timers [timercnt - 1] = w; 1748 timers [timercnt - 1] = (WT)w;
1608 upheap ((WT *)timers, timercnt - 1); 1749 upheap (timers, timercnt - 1);
1609 1750
1610 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1751 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1611} 1752}
1612 1753
1613void 1754void noinline
1614ev_timer_stop (EV_P_ ev_timer *w) 1755ev_timer_stop (EV_P_ ev_timer *w)
1615{ 1756{
1616 ev_clear_pending (EV_A_ (W)w); 1757 clear_pending (EV_A_ (W)w);
1617 if (expect_false (!ev_is_active (w))) 1758 if (expect_false (!ev_is_active (w)))
1618 return; 1759 return;
1619 1760
1620 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1761 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1621 1762
1622 { 1763 {
1623 int active = ((W)w)->active; 1764 int active = ((W)w)->active;
1624 1765
1625 if (expect_true (--active < --timercnt)) 1766 if (expect_true (--active < --timercnt))
1626 { 1767 {
1627 timers [active] = timers [timercnt]; 1768 timers [active] = timers [timercnt];
1628 adjustheap ((WT *)timers, timercnt, active); 1769 adjustheap (timers, timercnt, active);
1629 } 1770 }
1630 } 1771 }
1631 1772
1632 ((WT)w)->at -= mn_now; 1773 ((WT)w)->at -= mn_now;
1633 1774
1634 ev_stop (EV_A_ (W)w); 1775 ev_stop (EV_A_ (W)w);
1635} 1776}
1636 1777
1637void 1778void noinline
1638ev_timer_again (EV_P_ ev_timer *w) 1779ev_timer_again (EV_P_ ev_timer *w)
1639{ 1780{
1640 if (ev_is_active (w)) 1781 if (ev_is_active (w))
1641 { 1782 {
1642 if (w->repeat) 1783 if (w->repeat)
1643 { 1784 {
1644 ((WT)w)->at = mn_now + w->repeat; 1785 ((WT)w)->at = mn_now + w->repeat;
1645 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1786 adjustheap (timers, timercnt, ((W)w)->active - 1);
1646 } 1787 }
1647 else 1788 else
1648 ev_timer_stop (EV_A_ w); 1789 ev_timer_stop (EV_A_ w);
1649 } 1790 }
1650 else if (w->repeat) 1791 else if (w->repeat)
1653 ev_timer_start (EV_A_ w); 1794 ev_timer_start (EV_A_ w);
1654 } 1795 }
1655} 1796}
1656 1797
1657#if EV_PERIODIC_ENABLE 1798#if EV_PERIODIC_ENABLE
1658void 1799void noinline
1659ev_periodic_start (EV_P_ ev_periodic *w) 1800ev_periodic_start (EV_P_ ev_periodic *w)
1660{ 1801{
1661 if (expect_false (ev_is_active (w))) 1802 if (expect_false (ev_is_active (w)))
1662 return; 1803 return;
1663 1804
1665 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1806 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1666 else if (w->interval) 1807 else if (w->interval)
1667 { 1808 {
1668 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1809 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1669 /* this formula differs from the one in periodic_reify because we do not always round up */ 1810 /* this formula differs from the one in periodic_reify because we do not always round up */
1670 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1811 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1671 } 1812 }
1813 else
1814 ((WT)w)->at = w->offset;
1672 1815
1673 ev_start (EV_A_ (W)w, ++periodiccnt); 1816 ev_start (EV_A_ (W)w, ++periodiccnt);
1674 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1817 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1675 periodics [periodiccnt - 1] = w; 1818 periodics [periodiccnt - 1] = (WT)w;
1676 upheap ((WT *)periodics, periodiccnt - 1); 1819 upheap (periodics, periodiccnt - 1);
1677 1820
1678 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1821 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1679} 1822}
1680 1823
1681void 1824void noinline
1682ev_periodic_stop (EV_P_ ev_periodic *w) 1825ev_periodic_stop (EV_P_ ev_periodic *w)
1683{ 1826{
1684 ev_clear_pending (EV_A_ (W)w); 1827 clear_pending (EV_A_ (W)w);
1685 if (expect_false (!ev_is_active (w))) 1828 if (expect_false (!ev_is_active (w)))
1686 return; 1829 return;
1687 1830
1688 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1831 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1689 1832
1690 { 1833 {
1691 int active = ((W)w)->active; 1834 int active = ((W)w)->active;
1692 1835
1693 if (expect_true (--active < --periodiccnt)) 1836 if (expect_true (--active < --periodiccnt))
1694 { 1837 {
1695 periodics [active] = periodics [periodiccnt]; 1838 periodics [active] = periodics [periodiccnt];
1696 adjustheap ((WT *)periodics, periodiccnt, active); 1839 adjustheap (periodics, periodiccnt, active);
1697 } 1840 }
1698 } 1841 }
1699 1842
1700 ev_stop (EV_A_ (W)w); 1843 ev_stop (EV_A_ (W)w);
1701} 1844}
1702 1845
1703void 1846void noinline
1704ev_periodic_again (EV_P_ ev_periodic *w) 1847ev_periodic_again (EV_P_ ev_periodic *w)
1705{ 1848{
1706 /* TODO: use adjustheap and recalculation */ 1849 /* TODO: use adjustheap and recalculation */
1707 ev_periodic_stop (EV_A_ w); 1850 ev_periodic_stop (EV_A_ w);
1708 ev_periodic_start (EV_A_ w); 1851 ev_periodic_start (EV_A_ w);
1711 1854
1712#ifndef SA_RESTART 1855#ifndef SA_RESTART
1713# define SA_RESTART 0 1856# define SA_RESTART 0
1714#endif 1857#endif
1715 1858
1716void 1859void noinline
1717ev_signal_start (EV_P_ ev_signal *w) 1860ev_signal_start (EV_P_ ev_signal *w)
1718{ 1861{
1719#if EV_MULTIPLICITY 1862#if EV_MULTIPLICITY
1720 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1863 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1721#endif 1864#endif
1722 if (expect_false (ev_is_active (w))) 1865 if (expect_false (ev_is_active (w)))
1723 return; 1866 return;
1724 1867
1725 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1868 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1726 1869
1870 {
1871#ifndef _WIN32
1872 sigset_t full, prev;
1873 sigfillset (&full);
1874 sigprocmask (SIG_SETMASK, &full, &prev);
1875#endif
1876
1877 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1878
1879#ifndef _WIN32
1880 sigprocmask (SIG_SETMASK, &prev, 0);
1881#endif
1882 }
1883
1727 ev_start (EV_A_ (W)w, 1); 1884 ev_start (EV_A_ (W)w, 1);
1728 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1729 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1885 wlist_add (&signals [w->signum - 1].head, (WL)w);
1730 1886
1731 if (!((WL)w)->next) 1887 if (!((WL)w)->next)
1732 { 1888 {
1733#if _WIN32 1889#if _WIN32
1734 signal (w->signum, sighandler); 1890 signal (w->signum, sighandler);
1740 sigaction (w->signum, &sa, 0); 1896 sigaction (w->signum, &sa, 0);
1741#endif 1897#endif
1742 } 1898 }
1743} 1899}
1744 1900
1745void 1901void noinline
1746ev_signal_stop (EV_P_ ev_signal *w) 1902ev_signal_stop (EV_P_ ev_signal *w)
1747{ 1903{
1748 ev_clear_pending (EV_A_ (W)w); 1904 clear_pending (EV_A_ (W)w);
1749 if (expect_false (!ev_is_active (w))) 1905 if (expect_false (!ev_is_active (w)))
1750 return; 1906 return;
1751 1907
1752 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1908 wlist_del (&signals [w->signum - 1].head, (WL)w);
1753 ev_stop (EV_A_ (W)w); 1909 ev_stop (EV_A_ (W)w);
1754 1910
1755 if (!signals [w->signum - 1].head) 1911 if (!signals [w->signum - 1].head)
1756 signal (w->signum, SIG_DFL); 1912 signal (w->signum, SIG_DFL);
1757} 1913}
1764#endif 1920#endif
1765 if (expect_false (ev_is_active (w))) 1921 if (expect_false (ev_is_active (w)))
1766 return; 1922 return;
1767 1923
1768 ev_start (EV_A_ (W)w, 1); 1924 ev_start (EV_A_ (W)w, 1);
1769 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1925 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1770} 1926}
1771 1927
1772void 1928void
1773ev_child_stop (EV_P_ ev_child *w) 1929ev_child_stop (EV_P_ ev_child *w)
1774{ 1930{
1775 ev_clear_pending (EV_A_ (W)w); 1931 clear_pending (EV_A_ (W)w);
1776 if (expect_false (!ev_is_active (w))) 1932 if (expect_false (!ev_is_active (w)))
1777 return; 1933 return;
1778 1934
1779 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1935 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1780 ev_stop (EV_A_ (W)w); 1936 ev_stop (EV_A_ (W)w);
1781} 1937}
1782 1938
1783#if EV_STAT_ENABLE 1939#if EV_STAT_ENABLE
1784 1940
2016} 2172}
2017 2173
2018void 2174void
2019ev_stat_stop (EV_P_ ev_stat *w) 2175ev_stat_stop (EV_P_ ev_stat *w)
2020{ 2176{
2021 ev_clear_pending (EV_A_ (W)w); 2177 clear_pending (EV_A_ (W)w);
2022 if (expect_false (!ev_is_active (w))) 2178 if (expect_false (!ev_is_active (w)))
2023 return; 2179 return;
2024 2180
2025#if EV_USE_INOTIFY 2181#if EV_USE_INOTIFY
2026 infy_del (EV_A_ w); 2182 infy_del (EV_A_ w);
2052} 2208}
2053 2209
2054void 2210void
2055ev_idle_stop (EV_P_ ev_idle *w) 2211ev_idle_stop (EV_P_ ev_idle *w)
2056{ 2212{
2057 ev_clear_pending (EV_A_ (W)w); 2213 clear_pending (EV_A_ (W)w);
2058 if (expect_false (!ev_is_active (w))) 2214 if (expect_false (!ev_is_active (w)))
2059 return; 2215 return;
2060 2216
2061 { 2217 {
2062 int active = ((W)w)->active; 2218 int active = ((W)w)->active;
2082} 2238}
2083 2239
2084void 2240void
2085ev_prepare_stop (EV_P_ ev_prepare *w) 2241ev_prepare_stop (EV_P_ ev_prepare *w)
2086{ 2242{
2087 ev_clear_pending (EV_A_ (W)w); 2243 clear_pending (EV_A_ (W)w);
2088 if (expect_false (!ev_is_active (w))) 2244 if (expect_false (!ev_is_active (w)))
2089 return; 2245 return;
2090 2246
2091 { 2247 {
2092 int active = ((W)w)->active; 2248 int active = ((W)w)->active;
2109} 2265}
2110 2266
2111void 2267void
2112ev_check_stop (EV_P_ ev_check *w) 2268ev_check_stop (EV_P_ ev_check *w)
2113{ 2269{
2114 ev_clear_pending (EV_A_ (W)w); 2270 clear_pending (EV_A_ (W)w);
2115 if (expect_false (!ev_is_active (w))) 2271 if (expect_false (!ev_is_active (w)))
2116 return; 2272 return;
2117 2273
2118 { 2274 {
2119 int active = ((W)w)->active; 2275 int active = ((W)w)->active;
2126 2282
2127#if EV_EMBED_ENABLE 2283#if EV_EMBED_ENABLE
2128void noinline 2284void noinline
2129ev_embed_sweep (EV_P_ ev_embed *w) 2285ev_embed_sweep (EV_P_ ev_embed *w)
2130{ 2286{
2131 ev_loop (w->loop, EVLOOP_NONBLOCK); 2287 ev_loop (w->other, EVLOOP_NONBLOCK);
2132} 2288}
2133 2289
2134static void 2290static void
2135embed_cb (EV_P_ ev_io *io, int revents) 2291embed_io_cb (EV_P_ ev_io *io, int revents)
2136{ 2292{
2137 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2293 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2138 2294
2139 if (ev_cb (w)) 2295 if (ev_cb (w))
2140 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2296 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2141 else 2297 else
2142 ev_embed_sweep (loop, w); 2298 ev_loop (w->other, EVLOOP_NONBLOCK);
2143} 2299}
2300
2301static void
2302embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2303{
2304 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2305
2306 {
2307 struct ev_loop *loop = w->other;
2308
2309 while (fdchangecnt)
2310 {
2311 fd_reify (EV_A);
2312 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2313 }
2314 }
2315}
2316
2317#if 0
2318static void
2319embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2320{
2321 ev_idle_stop (EV_A_ idle);
2322}
2323#endif
2144 2324
2145void 2325void
2146ev_embed_start (EV_P_ ev_embed *w) 2326ev_embed_start (EV_P_ ev_embed *w)
2147{ 2327{
2148 if (expect_false (ev_is_active (w))) 2328 if (expect_false (ev_is_active (w)))
2149 return; 2329 return;
2150 2330
2151 { 2331 {
2152 struct ev_loop *loop = w->loop; 2332 struct ev_loop *loop = w->other;
2153 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2333 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2154 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2334 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2155 } 2335 }
2156 2336
2157 ev_set_priority (&w->io, ev_priority (w)); 2337 ev_set_priority (&w->io, ev_priority (w));
2158 ev_io_start (EV_A_ &w->io); 2338 ev_io_start (EV_A_ &w->io);
2159 2339
2340 ev_prepare_init (&w->prepare, embed_prepare_cb);
2341 ev_set_priority (&w->prepare, EV_MINPRI);
2342 ev_prepare_start (EV_A_ &w->prepare);
2343
2344 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2345
2160 ev_start (EV_A_ (W)w, 1); 2346 ev_start (EV_A_ (W)w, 1);
2161} 2347}
2162 2348
2163void 2349void
2164ev_embed_stop (EV_P_ ev_embed *w) 2350ev_embed_stop (EV_P_ ev_embed *w)
2165{ 2351{
2166 ev_clear_pending (EV_A_ (W)w); 2352 clear_pending (EV_A_ (W)w);
2167 if (expect_false (!ev_is_active (w))) 2353 if (expect_false (!ev_is_active (w)))
2168 return; 2354 return;
2169 2355
2170 ev_io_stop (EV_A_ &w->io); 2356 ev_io_stop (EV_A_ &w->io);
2357 ev_prepare_stop (EV_A_ &w->prepare);
2171 2358
2172 ev_stop (EV_A_ (W)w); 2359 ev_stop (EV_A_ (W)w);
2173} 2360}
2174#endif 2361#endif
2175 2362
2186} 2373}
2187 2374
2188void 2375void
2189ev_fork_stop (EV_P_ ev_fork *w) 2376ev_fork_stop (EV_P_ ev_fork *w)
2190{ 2377{
2191 ev_clear_pending (EV_A_ (W)w); 2378 clear_pending (EV_A_ (W)w);
2192 if (expect_false (!ev_is_active (w))) 2379 if (expect_false (!ev_is_active (w)))
2193 return; 2380 return;
2194 2381
2195 { 2382 {
2196 int active = ((W)w)->active; 2383 int active = ((W)w)->active;
2264 ev_timer_set (&once->to, timeout, 0.); 2451 ev_timer_set (&once->to, timeout, 0.);
2265 ev_timer_start (EV_A_ &once->to); 2452 ev_timer_start (EV_A_ &once->to);
2266 } 2453 }
2267} 2454}
2268 2455
2456#if EV_MULTIPLICITY
2457 #include "ev_wrap.h"
2458#endif
2459
2269#ifdef __cplusplus 2460#ifdef __cplusplus
2270} 2461}
2271#endif 2462#endif
2272 2463

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines