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

Comparing libev/ev.c (file contents):
Revision 1.168 by root, Sat Dec 8 14:12:07 2007 UTC vs.
Revision 1.199 by root, Tue Dec 25 07:05:45 2007 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)
… …
522 { 591 {
523 int fd = fdchanges [i]; 592 int fd = fdchanges [i];
524 ANFD *anfd = anfds + fd; 593 ANFD *anfd = anfds + fd;
525 ev_io *w; 594 ev_io *w;
526 595
527 int events = 0; 596 unsigned char events = 0;
528 597
529 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)
530 events |= w->events; 599 events |= (unsigned char)w->events;
531 600
532#if EV_SELECT_IS_WINSOCKET 601#if EV_SELECT_IS_WINSOCKET
533 if (events) 602 if (events)
534 { 603 {
535 unsigned long argp; 604 unsigned long argp;
536 anfd->handle = _get_osfhandle (fd); 605 anfd->handle = _get_osfhandle (fd);
537 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 606 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
538 } 607 }
539#endif 608#endif
540 609
610 {
611 unsigned char o_events = anfd->events;
612 unsigned char o_reify = anfd->reify;
613
541 anfd->reify = 0; 614 anfd->reify = 0;
542
543 backend_modify (EV_A_ fd, anfd->events, events);
544 anfd->events = events; 615 anfd->events = events;
616
617 if (o_events != events || o_reify & EV_IOFDSET)
618 backend_modify (EV_A_ fd, o_events, events);
619 }
545 } 620 }
546 621
547 fdchangecnt = 0; 622 fdchangecnt = 0;
548} 623}
549 624
550void inline_size 625void inline_size
551fd_change (EV_P_ int fd) 626fd_change (EV_P_ int fd, int flags)
552{ 627{
553 if (expect_false (anfds [fd].reify)) 628 unsigned char reify = anfds [fd].reify;
554 return;
555
556 anfds [fd].reify = 1; 629 anfds [fd].reify |= flags;
557 630
631 if (expect_true (!reify))
632 {
558 ++fdchangecnt; 633 ++fdchangecnt;
559 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 634 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
560 fdchanges [fdchangecnt - 1] = fd; 635 fdchanges [fdchangecnt - 1] = fd;
636 }
561} 637}
562 638
563void inline_speed 639void inline_speed
564fd_kill (EV_P_ int fd) 640fd_kill (EV_P_ int fd)
565{ 641{
… …
616 692
617 for (fd = 0; fd < anfdmax; ++fd) 693 for (fd = 0; fd < anfdmax; ++fd)
618 if (anfds [fd].events) 694 if (anfds [fd].events)
619 { 695 {
620 anfds [fd].events = 0; 696 anfds [fd].events = 0;
621 fd_change (EV_A_ fd); 697 fd_change (EV_A_ fd, EV_IOFDSET | 1);
622 } 698 }
623} 699}
624 700
625/*****************************************************************************/ 701/*****************************************************************************/
626 702
627void inline_speed 703void inline_speed
628upheap (WT *heap, int k) 704upheap (WT *heap, int k)
629{ 705{
630 WT w = heap [k]; 706 WT w = heap [k];
631 707
632 while (k && heap [k >> 1]->at > w->at) 708 while (k)
633 { 709 {
710 int p = (k - 1) >> 1;
711
712 if (heap [p]->at <= w->at)
713 break;
714
634 heap [k] = heap [k >> 1]; 715 heap [k] = heap [p];
635 ((W)heap [k])->active = k + 1; 716 ((W)heap [k])->active = k + 1;
636 k >>= 1; 717 k = p;
637 } 718 }
638 719
639 heap [k] = w; 720 heap [k] = w;
640 ((W)heap [k])->active = k + 1; 721 ((W)heap [k])->active = k + 1;
641
642} 722}
643 723
644void inline_speed 724void inline_speed
645downheap (WT *heap, int N, int k) 725downheap (WT *heap, int N, int k)
646{ 726{
647 WT w = heap [k]; 727 WT w = heap [k];
648 728
649 while (k < (N >> 1)) 729 for (;;)
650 { 730 {
651 int j = k << 1; 731 int c = (k << 1) + 1;
652 732
653 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 733 if (c >= N)
654 ++j;
655
656 if (w->at <= heap [j]->at)
657 break; 734 break;
658 735
736 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
737 ? 1 : 0;
738
739 if (w->at <= heap [c]->at)
740 break;
741
659 heap [k] = heap [j]; 742 heap [k] = heap [c];
660 ((W)heap [k])->active = k + 1; 743 ((W)heap [k])->active = k + 1;
744
661 k = j; 745 k = c;
662 } 746 }
663 747
664 heap [k] = w; 748 heap [k] = w;
665 ((W)heap [k])->active = k + 1; 749 ((W)heap [k])->active = k + 1;
666} 750}
… …
748 for (signum = signalmax; signum--; ) 832 for (signum = signalmax; signum--; )
749 if (signals [signum].gotsig) 833 if (signals [signum].gotsig)
750 ev_feed_signal_event (EV_A_ signum + 1); 834 ev_feed_signal_event (EV_A_ signum + 1);
751} 835}
752 836
753void inline_size 837void inline_speed
754fd_intern (int fd) 838fd_intern (int fd)
755{ 839{
756#ifdef _WIN32 840#ifdef _WIN32
757 int arg = 1; 841 int arg = 1;
758 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 842 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
773 ev_unref (EV_A); /* child watcher should not keep loop alive */ 857 ev_unref (EV_A); /* child watcher should not keep loop alive */
774} 858}
775 859
776/*****************************************************************************/ 860/*****************************************************************************/
777 861
778static ev_child *childs [EV_PID_HASHSIZE]; 862static WL childs [EV_PID_HASHSIZE];
779 863
780#ifndef _WIN32 864#ifndef _WIN32
781 865
782static ev_signal childev; 866static ev_signal childev;
783 867
… …
898} 982}
899 983
900unsigned int 984unsigned int
901ev_embeddable_backends (void) 985ev_embeddable_backends (void)
902{ 986{
903 return EVBACKEND_EPOLL 987 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
904 | EVBACKEND_KQUEUE 988
905 | EVBACKEND_PORT; 989 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
990 /* please fix it and tell me how to detect the fix */
991 flags &= ~EVBACKEND_EPOLL;
992
993 return flags;
906} 994}
907 995
908unsigned int 996unsigned int
909ev_backend (EV_P) 997ev_backend (EV_P)
910{ 998{
… …
913 1001
914unsigned int 1002unsigned int
915ev_loop_count (EV_P) 1003ev_loop_count (EV_P)
916{ 1004{
917 return loop_count; 1005 return loop_count;
1006}
1007
1008void
1009ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1010{
1011 io_blocktime = interval;
1012}
1013
1014void
1015ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1016{
1017 timeout_blocktime = interval;
918} 1018}
919 1019
920static void noinline 1020static void noinline
921loop_init (EV_P_ unsigned int flags) 1021loop_init (EV_P_ unsigned int flags)
922{ 1022{
… …
933 ev_rt_now = ev_time (); 1033 ev_rt_now = ev_time ();
934 mn_now = get_clock (); 1034 mn_now = get_clock ();
935 now_floor = mn_now; 1035 now_floor = mn_now;
936 rtmn_diff = ev_rt_now - mn_now; 1036 rtmn_diff = ev_rt_now - mn_now;
937 1037
1038 io_blocktime = 0.;
1039 timeout_blocktime = 0.;
1040
938 /* pid check not overridable via env */ 1041 /* pid check not overridable via env */
939#ifndef _WIN32 1042#ifndef _WIN32
940 if (flags & EVFLAG_FORKCHECK) 1043 if (flags & EVFLAG_FORKCHECK)
941 curpid = getpid (); 1044 curpid = getpid ();
942#endif 1045#endif
… …
1010 array_free (pending, [i]); 1113 array_free (pending, [i]);
1011#if EV_IDLE_ENABLE 1114#if EV_IDLE_ENABLE
1012 array_free (idle, [i]); 1115 array_free (idle, [i]);
1013#endif 1116#endif
1014 } 1117 }
1118
1119 ev_free (anfds); anfdmax = 0;
1015 1120
1016 /* have to use the microsoft-never-gets-it-right macro */ 1121 /* have to use the microsoft-never-gets-it-right macro */
1017 array_free (fdchange, EMPTY); 1122 array_free (fdchange, EMPTY);
1018 array_free (timer, EMPTY); 1123 array_free (timer, EMPTY);
1019#if EV_PERIODIC_ENABLE 1124#if EV_PERIODIC_ENABLE
1020 array_free (periodic, EMPTY); 1125 array_free (periodic, EMPTY);
1126#endif
1127#if EV_FORK_ENABLE
1128 array_free (fork, EMPTY);
1021#endif 1129#endif
1022 array_free (prepare, EMPTY); 1130 array_free (prepare, EMPTY);
1023 array_free (check, EMPTY); 1131 array_free (check, EMPTY);
1024 1132
1025 backend = 0; 1133 backend = 0;
… …
1195void inline_size 1303void inline_size
1196timers_reify (EV_P) 1304timers_reify (EV_P)
1197{ 1305{
1198 while (timercnt && ((WT)timers [0])->at <= mn_now) 1306 while (timercnt && ((WT)timers [0])->at <= mn_now)
1199 { 1307 {
1200 ev_timer *w = timers [0]; 1308 ev_timer *w = (ev_timer *)timers [0];
1201 1309
1202 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1310 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1203 1311
1204 /* first reschedule or stop timer */ 1312 /* first reschedule or stop timer */
1205 if (w->repeat) 1313 if (w->repeat)
… …
1208 1316
1209 ((WT)w)->at += w->repeat; 1317 ((WT)w)->at += w->repeat;
1210 if (((WT)w)->at < mn_now) 1318 if (((WT)w)->at < mn_now)
1211 ((WT)w)->at = mn_now; 1319 ((WT)w)->at = mn_now;
1212 1320
1213 downheap ((WT *)timers, timercnt, 0); 1321 downheap (timers, timercnt, 0);
1214 } 1322 }
1215 else 1323 else
1216 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1324 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1217 1325
1218 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1326 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1223void inline_size 1331void inline_size
1224periodics_reify (EV_P) 1332periodics_reify (EV_P)
1225{ 1333{
1226 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1334 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1227 { 1335 {
1228 ev_periodic *w = periodics [0]; 1336 ev_periodic *w = (ev_periodic *)periodics [0];
1229 1337
1230 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1338 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1231 1339
1232 /* first reschedule or stop timer */ 1340 /* first reschedule or stop timer */
1233 if (w->reschedule_cb) 1341 if (w->reschedule_cb)
1234 { 1342 {
1235 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1343 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1236 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1344 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1237 downheap ((WT *)periodics, periodiccnt, 0); 1345 downheap (periodics, periodiccnt, 0);
1238 } 1346 }
1239 else if (w->interval) 1347 else if (w->interval)
1240 { 1348 {
1241 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1349 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1350 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1242 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1351 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1243 downheap ((WT *)periodics, periodiccnt, 0); 1352 downheap (periodics, periodiccnt, 0);
1244 } 1353 }
1245 else 1354 else
1246 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1355 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1247 1356
1248 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1357 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1255 int i; 1364 int i;
1256 1365
1257 /* adjust periodics after time jump */ 1366 /* adjust periodics after time jump */
1258 for (i = 0; i < periodiccnt; ++i) 1367 for (i = 0; i < periodiccnt; ++i)
1259 { 1368 {
1260 ev_periodic *w = periodics [i]; 1369 ev_periodic *w = (ev_periodic *)periodics [i];
1261 1370
1262 if (w->reschedule_cb) 1371 if (w->reschedule_cb)
1263 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1372 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1264 else if (w->interval) 1373 else if (w->interval)
1265 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1374 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1266 } 1375 }
1267 1376
1268 /* now rebuild the heap */ 1377 /* now rebuild the heap */
1269 for (i = periodiccnt >> 1; i--; ) 1378 for (i = periodiccnt >> 1; i--; )
1270 downheap ((WT *)periodics, periodiccnt, i); 1379 downheap (periodics, periodiccnt, i);
1271} 1380}
1272#endif 1381#endif
1273 1382
1274#if EV_IDLE_ENABLE 1383#if EV_IDLE_ENABLE
1275void inline_size 1384void inline_size
… …
1292 } 1401 }
1293 } 1402 }
1294} 1403}
1295#endif 1404#endif
1296 1405
1297int inline_size 1406void inline_speed
1298time_update_monotonic (EV_P) 1407time_update (EV_P_ ev_tstamp max_block)
1299{ 1408{
1409 int i;
1410
1411#if EV_USE_MONOTONIC
1412 if (expect_true (have_monotonic))
1413 {
1414 ev_tstamp odiff = rtmn_diff;
1415
1300 mn_now = get_clock (); 1416 mn_now = get_clock ();
1301 1417
1418 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1419 /* interpolate in the meantime */
1302 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1420 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1303 { 1421 {
1304 ev_rt_now = rtmn_diff + mn_now; 1422 ev_rt_now = rtmn_diff + mn_now;
1305 return 0; 1423 return;
1306 } 1424 }
1307 else 1425
1308 {
1309 now_floor = mn_now; 1426 now_floor = mn_now;
1310 ev_rt_now = ev_time (); 1427 ev_rt_now = ev_time ();
1311 return 1;
1312 }
1313}
1314 1428
1315void inline_size 1429 /* loop a few times, before making important decisions.
1316time_update (EV_P) 1430 * on the choice of "4": one iteration isn't enough,
1317{ 1431 * in case we get preempted during the calls to
1318 int i; 1432 * ev_time and get_clock. a second call is almost guaranteed
1319 1433 * to succeed in that case, though. and looping a few more times
1320#if EV_USE_MONOTONIC 1434 * doesn't hurt either as we only do this on time-jumps or
1321 if (expect_true (have_monotonic)) 1435 * in the unlikely event of having been preempted here.
1322 { 1436 */
1323 if (time_update_monotonic (EV_A)) 1437 for (i = 4; --i; )
1324 { 1438 {
1325 ev_tstamp odiff = rtmn_diff;
1326
1327 /* loop a few times, before making important decisions.
1328 * on the choice of "4": one iteration isn't enough,
1329 * in case we get preempted during the calls to
1330 * ev_time and get_clock. a second call is almost guaranteed
1331 * to succeed in that case, though. and looping a few more times
1332 * doesn't hurt either as we only do this on time-jumps or
1333 * in the unlikely event of having been preempted here.
1334 */
1335 for (i = 4; --i; )
1336 {
1337 rtmn_diff = ev_rt_now - mn_now; 1439 rtmn_diff = ev_rt_now - mn_now;
1338 1440
1339 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1441 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1340 return; /* all is well */ 1442 return; /* all is well */
1341 1443
1342 ev_rt_now = ev_time (); 1444 ev_rt_now = ev_time ();
1343 mn_now = get_clock (); 1445 mn_now = get_clock ();
1344 now_floor = mn_now; 1446 now_floor = mn_now;
1345 } 1447 }
1346 1448
1347# if EV_PERIODIC_ENABLE 1449# if EV_PERIODIC_ENABLE
1348 periodics_reschedule (EV_A); 1450 periodics_reschedule (EV_A);
1349# endif 1451# endif
1350 /* no timer adjustment, as the monotonic clock doesn't jump */ 1452 /* no timer adjustment, as the monotonic clock doesn't jump */
1351 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1453 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1352 }
1353 } 1454 }
1354 else 1455 else
1355#endif 1456#endif
1356 { 1457 {
1357 ev_rt_now = ev_time (); 1458 ev_rt_now = ev_time ();
1358 1459
1359 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1460 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1360 { 1461 {
1361#if EV_PERIODIC_ENABLE 1462#if EV_PERIODIC_ENABLE
1362 periodics_reschedule (EV_A); 1463 periodics_reschedule (EV_A);
1363#endif 1464#endif
1364
1365 /* adjust timers. this is easy, as the offset is the same for all of them */ 1465 /* adjust timers. this is easy, as the offset is the same for all of them */
1366 for (i = 0; i < timercnt; ++i) 1466 for (i = 0; i < timercnt; ++i)
1367 ((WT)timers [i])->at += ev_rt_now - mn_now; 1467 ((WT)timers [i])->at += ev_rt_now - mn_now;
1368 } 1468 }
1369 1469
… …
1413 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1513 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1414 call_pending (EV_A); 1514 call_pending (EV_A);
1415 } 1515 }
1416#endif 1516#endif
1417 1517
1418 /* queue check watchers (and execute them) */ 1518 /* queue prepare watchers (and execute them) */
1419 if (expect_false (preparecnt)) 1519 if (expect_false (preparecnt))
1420 { 1520 {
1421 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1521 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1422 call_pending (EV_A); 1522 call_pending (EV_A);
1423 } 1523 }
… …
1432 /* update fd-related kernel structures */ 1532 /* update fd-related kernel structures */
1433 fd_reify (EV_A); 1533 fd_reify (EV_A);
1434 1534
1435 /* calculate blocking time */ 1535 /* calculate blocking time */
1436 { 1536 {
1437 ev_tstamp block; 1537 ev_tstamp waittime = 0.;
1538 ev_tstamp sleeptime = 0.;
1438 1539
1439 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1540 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1440 block = 0.; /* do not block at all */
1441 else
1442 { 1541 {
1443 /* update time to cancel out callback processing overhead */ 1542 /* update time to cancel out callback processing overhead */
1444#if EV_USE_MONOTONIC
1445 if (expect_true (have_monotonic))
1446 time_update_monotonic (EV_A); 1543 time_update (EV_A_ 1e100);
1447 else
1448#endif
1449 {
1450 ev_rt_now = ev_time ();
1451 mn_now = ev_rt_now;
1452 }
1453 1544
1454 block = MAX_BLOCKTIME; 1545 waittime = MAX_BLOCKTIME;
1455 1546
1456 if (timercnt) 1547 if (timercnt)
1457 { 1548 {
1458 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1549 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1459 if (block > to) block = to; 1550 if (waittime > to) waittime = to;
1460 } 1551 }
1461 1552
1462#if EV_PERIODIC_ENABLE 1553#if EV_PERIODIC_ENABLE
1463 if (periodiccnt) 1554 if (periodiccnt)
1464 { 1555 {
1465 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1556 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1466 if (block > to) block = to; 1557 if (waittime > to) waittime = to;
1467 } 1558 }
1468#endif 1559#endif
1469 1560
1470 if (expect_false (block < 0.)) block = 0.; 1561 if (expect_false (waittime < timeout_blocktime))
1562 waittime = timeout_blocktime;
1563
1564 sleeptime = waittime - backend_fudge;
1565
1566 if (expect_true (sleeptime > io_blocktime))
1567 sleeptime = io_blocktime;
1568
1569 if (sleeptime)
1570 {
1571 ev_sleep (sleeptime);
1572 waittime -= sleeptime;
1573 }
1471 } 1574 }
1472 1575
1473 ++loop_count; 1576 ++loop_count;
1474 backend_poll (EV_A_ block); 1577 backend_poll (EV_A_ waittime);
1578
1579 /* update ev_rt_now, do magic */
1580 time_update (EV_A_ waittime + sleeptime);
1475 } 1581 }
1476
1477 /* update ev_rt_now, do magic */
1478 time_update (EV_A);
1479 1582
1480 /* queue pending timers and reschedule them */ 1583 /* queue pending timers and reschedule them */
1481 timers_reify (EV_A); /* relative timers called last */ 1584 timers_reify (EV_A); /* relative timers called last */
1482#if EV_PERIODIC_ENABLE 1585#if EV_PERIODIC_ENABLE
1483 periodics_reify (EV_A); /* absolute timers called first */ 1586 periodics_reify (EV_A); /* absolute timers called first */
… …
1545ev_clear_pending (EV_P_ void *w) 1648ev_clear_pending (EV_P_ void *w)
1546{ 1649{
1547 W w_ = (W)w; 1650 W w_ = (W)w;
1548 int pending = w_->pending; 1651 int pending = w_->pending;
1549 1652
1550 if (!pending) 1653 if (expect_true (pending))
1654 {
1655 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1656 w_->pending = 0;
1657 p->w = 0;
1658 return p->events;
1659 }
1660 else
1551 return 0; 1661 return 0;
1552
1553 w_->pending = 0;
1554 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1555 p->w = 0;
1556
1557 return p->events;
1558} 1662}
1559 1663
1560void inline_size 1664void inline_size
1561pri_adjust (EV_P_ W w) 1665pri_adjust (EV_P_ W w)
1562{ 1666{
… …
1581 w->active = 0; 1685 w->active = 0;
1582} 1686}
1583 1687
1584/*****************************************************************************/ 1688/*****************************************************************************/
1585 1689
1586void 1690void noinline
1587ev_io_start (EV_P_ ev_io *w) 1691ev_io_start (EV_P_ ev_io *w)
1588{ 1692{
1589 int fd = w->fd; 1693 int fd = w->fd;
1590 1694
1591 if (expect_false (ev_is_active (w))) 1695 if (expect_false (ev_is_active (w)))
… …
1593 1697
1594 assert (("ev_io_start called with negative fd", fd >= 0)); 1698 assert (("ev_io_start called with negative fd", fd >= 0));
1595 1699
1596 ev_start (EV_A_ (W)w, 1); 1700 ev_start (EV_A_ (W)w, 1);
1597 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1701 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1598 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1702 wlist_add (&anfds[fd].head, (WL)w);
1599 1703
1600 fd_change (EV_A_ fd); 1704 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1705 w->events &= ~EV_IOFDSET;
1601} 1706}
1602 1707
1603void 1708void noinline
1604ev_io_stop (EV_P_ ev_io *w) 1709ev_io_stop (EV_P_ ev_io *w)
1605{ 1710{
1606 clear_pending (EV_A_ (W)w); 1711 clear_pending (EV_A_ (W)w);
1607 if (expect_false (!ev_is_active (w))) 1712 if (expect_false (!ev_is_active (w)))
1608 return; 1713 return;
1609 1714
1610 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1715 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1611 1716
1612 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1717 wlist_del (&anfds[w->fd].head, (WL)w);
1613 ev_stop (EV_A_ (W)w); 1718 ev_stop (EV_A_ (W)w);
1614 1719
1615 fd_change (EV_A_ w->fd); 1720 fd_change (EV_A_ w->fd, 1);
1616} 1721}
1617 1722
1618void 1723void noinline
1619ev_timer_start (EV_P_ ev_timer *w) 1724ev_timer_start (EV_P_ ev_timer *w)
1620{ 1725{
1621 if (expect_false (ev_is_active (w))) 1726 if (expect_false (ev_is_active (w)))
1622 return; 1727 return;
1623 1728
1624 ((WT)w)->at += mn_now; 1729 ((WT)w)->at += mn_now;
1625 1730
1626 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1731 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1627 1732
1628 ev_start (EV_A_ (W)w, ++timercnt); 1733 ev_start (EV_A_ (W)w, ++timercnt);
1629 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1734 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1630 timers [timercnt - 1] = w; 1735 timers [timercnt - 1] = (WT)w;
1631 upheap ((WT *)timers, timercnt - 1); 1736 upheap (timers, timercnt - 1);
1632 1737
1633 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1738 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1634} 1739}
1635 1740
1636void 1741void noinline
1637ev_timer_stop (EV_P_ ev_timer *w) 1742ev_timer_stop (EV_P_ ev_timer *w)
1638{ 1743{
1639 clear_pending (EV_A_ (W)w); 1744 clear_pending (EV_A_ (W)w);
1640 if (expect_false (!ev_is_active (w))) 1745 if (expect_false (!ev_is_active (w)))
1641 return; 1746 return;
1642 1747
1643 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1748 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1644 1749
1645 { 1750 {
1646 int active = ((W)w)->active; 1751 int active = ((W)w)->active;
1647 1752
1648 if (expect_true (--active < --timercnt)) 1753 if (expect_true (--active < --timercnt))
1649 { 1754 {
1650 timers [active] = timers [timercnt]; 1755 timers [active] = timers [timercnt];
1651 adjustheap ((WT *)timers, timercnt, active); 1756 adjustheap (timers, timercnt, active);
1652 } 1757 }
1653 } 1758 }
1654 1759
1655 ((WT)w)->at -= mn_now; 1760 ((WT)w)->at -= mn_now;
1656 1761
1657 ev_stop (EV_A_ (W)w); 1762 ev_stop (EV_A_ (W)w);
1658} 1763}
1659 1764
1660void 1765void noinline
1661ev_timer_again (EV_P_ ev_timer *w) 1766ev_timer_again (EV_P_ ev_timer *w)
1662{ 1767{
1663 if (ev_is_active (w)) 1768 if (ev_is_active (w))
1664 { 1769 {
1665 if (w->repeat) 1770 if (w->repeat)
1666 { 1771 {
1667 ((WT)w)->at = mn_now + w->repeat; 1772 ((WT)w)->at = mn_now + w->repeat;
1668 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1773 adjustheap (timers, timercnt, ((W)w)->active - 1);
1669 } 1774 }
1670 else 1775 else
1671 ev_timer_stop (EV_A_ w); 1776 ev_timer_stop (EV_A_ w);
1672 } 1777 }
1673 else if (w->repeat) 1778 else if (w->repeat)
… …
1676 ev_timer_start (EV_A_ w); 1781 ev_timer_start (EV_A_ w);
1677 } 1782 }
1678} 1783}
1679 1784
1680#if EV_PERIODIC_ENABLE 1785#if EV_PERIODIC_ENABLE
1681void 1786void noinline
1682ev_periodic_start (EV_P_ ev_periodic *w) 1787ev_periodic_start (EV_P_ ev_periodic *w)
1683{ 1788{
1684 if (expect_false (ev_is_active (w))) 1789 if (expect_false (ev_is_active (w)))
1685 return; 1790 return;
1686 1791
… …
1688 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1793 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1689 else if (w->interval) 1794 else if (w->interval)
1690 { 1795 {
1691 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1796 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1692 /* this formula differs from the one in periodic_reify because we do not always round up */ 1797 /* this formula differs from the one in periodic_reify because we do not always round up */
1693 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1798 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1694 } 1799 }
1800 else
1801 ((WT)w)->at = w->offset;
1695 1802
1696 ev_start (EV_A_ (W)w, ++periodiccnt); 1803 ev_start (EV_A_ (W)w, ++periodiccnt);
1697 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1804 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1698 periodics [periodiccnt - 1] = w; 1805 periodics [periodiccnt - 1] = (WT)w;
1699 upheap ((WT *)periodics, periodiccnt - 1); 1806 upheap (periodics, periodiccnt - 1);
1700 1807
1701 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1808 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1702} 1809}
1703 1810
1704void 1811void noinline
1705ev_periodic_stop (EV_P_ ev_periodic *w) 1812ev_periodic_stop (EV_P_ ev_periodic *w)
1706{ 1813{
1707 clear_pending (EV_A_ (W)w); 1814 clear_pending (EV_A_ (W)w);
1708 if (expect_false (!ev_is_active (w))) 1815 if (expect_false (!ev_is_active (w)))
1709 return; 1816 return;
1710 1817
1711 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1818 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1712 1819
1713 { 1820 {
1714 int active = ((W)w)->active; 1821 int active = ((W)w)->active;
1715 1822
1716 if (expect_true (--active < --periodiccnt)) 1823 if (expect_true (--active < --periodiccnt))
1717 { 1824 {
1718 periodics [active] = periodics [periodiccnt]; 1825 periodics [active] = periodics [periodiccnt];
1719 adjustheap ((WT *)periodics, periodiccnt, active); 1826 adjustheap (periodics, periodiccnt, active);
1720 } 1827 }
1721 } 1828 }
1722 1829
1723 ev_stop (EV_A_ (W)w); 1830 ev_stop (EV_A_ (W)w);
1724} 1831}
1725 1832
1726void 1833void noinline
1727ev_periodic_again (EV_P_ ev_periodic *w) 1834ev_periodic_again (EV_P_ ev_periodic *w)
1728{ 1835{
1729 /* TODO: use adjustheap and recalculation */ 1836 /* TODO: use adjustheap and recalculation */
1730 ev_periodic_stop (EV_A_ w); 1837 ev_periodic_stop (EV_A_ w);
1731 ev_periodic_start (EV_A_ w); 1838 ev_periodic_start (EV_A_ w);
… …
1734 1841
1735#ifndef SA_RESTART 1842#ifndef SA_RESTART
1736# define SA_RESTART 0 1843# define SA_RESTART 0
1737#endif 1844#endif
1738 1845
1739void 1846void noinline
1740ev_signal_start (EV_P_ ev_signal *w) 1847ev_signal_start (EV_P_ ev_signal *w)
1741{ 1848{
1742#if EV_MULTIPLICITY 1849#if EV_MULTIPLICITY
1743 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1850 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1744#endif 1851#endif
1745 if (expect_false (ev_is_active (w))) 1852 if (expect_false (ev_is_active (w)))
1746 return; 1853 return;
1747 1854
1748 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1855 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1749 1856
1857 {
1858#ifndef _WIN32
1859 sigset_t full, prev;
1860 sigfillset (&full);
1861 sigprocmask (SIG_SETMASK, &full, &prev);
1862#endif
1863
1864 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1865
1866#ifndef _WIN32
1867 sigprocmask (SIG_SETMASK, &prev, 0);
1868#endif
1869 }
1870
1750 ev_start (EV_A_ (W)w, 1); 1871 ev_start (EV_A_ (W)w, 1);
1751 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1752 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1872 wlist_add (&signals [w->signum - 1].head, (WL)w);
1753 1873
1754 if (!((WL)w)->next) 1874 if (!((WL)w)->next)
1755 { 1875 {
1756#if _WIN32 1876#if _WIN32
1757 signal (w->signum, sighandler); 1877 signal (w->signum, sighandler);
… …
1763 sigaction (w->signum, &sa, 0); 1883 sigaction (w->signum, &sa, 0);
1764#endif 1884#endif
1765 } 1885 }
1766} 1886}
1767 1887
1768void 1888void noinline
1769ev_signal_stop (EV_P_ ev_signal *w) 1889ev_signal_stop (EV_P_ ev_signal *w)
1770{ 1890{
1771 clear_pending (EV_A_ (W)w); 1891 clear_pending (EV_A_ (W)w);
1772 if (expect_false (!ev_is_active (w))) 1892 if (expect_false (!ev_is_active (w)))
1773 return; 1893 return;
1774 1894
1775 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1895 wlist_del (&signals [w->signum - 1].head, (WL)w);
1776 ev_stop (EV_A_ (W)w); 1896 ev_stop (EV_A_ (W)w);
1777 1897
1778 if (!signals [w->signum - 1].head) 1898 if (!signals [w->signum - 1].head)
1779 signal (w->signum, SIG_DFL); 1899 signal (w->signum, SIG_DFL);
1780} 1900}
… …
1787#endif 1907#endif
1788 if (expect_false (ev_is_active (w))) 1908 if (expect_false (ev_is_active (w)))
1789 return; 1909 return;
1790 1910
1791 ev_start (EV_A_ (W)w, 1); 1911 ev_start (EV_A_ (W)w, 1);
1792 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1912 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1793} 1913}
1794 1914
1795void 1915void
1796ev_child_stop (EV_P_ ev_child *w) 1916ev_child_stop (EV_P_ ev_child *w)
1797{ 1917{
1798 clear_pending (EV_A_ (W)w); 1918 clear_pending (EV_A_ (W)w);
1799 if (expect_false (!ev_is_active (w))) 1919 if (expect_false (!ev_is_active (w)))
1800 return; 1920 return;
1801 1921
1802 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1922 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1803 ev_stop (EV_A_ (W)w); 1923 ev_stop (EV_A_ (W)w);
1804} 1924}
1805 1925
1806#if EV_STAT_ENABLE 1926#if EV_STAT_ENABLE
1807 1927
… …
2149 2269
2150#if EV_EMBED_ENABLE 2270#if EV_EMBED_ENABLE
2151void noinline 2271void noinline
2152ev_embed_sweep (EV_P_ ev_embed *w) 2272ev_embed_sweep (EV_P_ ev_embed *w)
2153{ 2273{
2154 ev_loop (w->loop, EVLOOP_NONBLOCK); 2274 ev_loop (w->other, EVLOOP_NONBLOCK);
2155} 2275}
2156 2276
2157static void 2277static void
2158embed_cb (EV_P_ ev_io *io, int revents) 2278embed_io_cb (EV_P_ ev_io *io, int revents)
2159{ 2279{
2160 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2280 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2161 2281
2162 if (ev_cb (w)) 2282 if (ev_cb (w))
2163 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2283 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2164 else 2284 else
2165 ev_embed_sweep (loop, w); 2285 ev_loop (w->other, EVLOOP_NONBLOCK);
2166} 2286}
2287
2288static void
2289embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2290{
2291 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2292
2293 {
2294 struct ev_loop *loop = w->other;
2295
2296 while (fdchangecnt)
2297 {
2298 fd_reify (EV_A);
2299 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2300 }
2301 }
2302}
2303
2304#if 0
2305static void
2306embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2307{
2308 ev_idle_stop (EV_A_ idle);
2309}
2310#endif
2167 2311
2168void 2312void
2169ev_embed_start (EV_P_ ev_embed *w) 2313ev_embed_start (EV_P_ ev_embed *w)
2170{ 2314{
2171 if (expect_false (ev_is_active (w))) 2315 if (expect_false (ev_is_active (w)))
2172 return; 2316 return;
2173 2317
2174 { 2318 {
2175 struct ev_loop *loop = w->loop; 2319 struct ev_loop *loop = w->other;
2176 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2320 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2177 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2321 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2178 } 2322 }
2179 2323
2180 ev_set_priority (&w->io, ev_priority (w)); 2324 ev_set_priority (&w->io, ev_priority (w));
2181 ev_io_start (EV_A_ &w->io); 2325 ev_io_start (EV_A_ &w->io);
2182 2326
2327 ev_prepare_init (&w->prepare, embed_prepare_cb);
2328 ev_set_priority (&w->prepare, EV_MINPRI);
2329 ev_prepare_start (EV_A_ &w->prepare);
2330
2331 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2332
2183 ev_start (EV_A_ (W)w, 1); 2333 ev_start (EV_A_ (W)w, 1);
2184} 2334}
2185 2335
2186void 2336void
2187ev_embed_stop (EV_P_ ev_embed *w) 2337ev_embed_stop (EV_P_ ev_embed *w)
… …
2189 clear_pending (EV_A_ (W)w); 2339 clear_pending (EV_A_ (W)w);
2190 if (expect_false (!ev_is_active (w))) 2340 if (expect_false (!ev_is_active (w)))
2191 return; 2341 return;
2192 2342
2193 ev_io_stop (EV_A_ &w->io); 2343 ev_io_stop (EV_A_ &w->io);
2344 ev_prepare_stop (EV_A_ &w->prepare);
2194 2345
2195 ev_stop (EV_A_ (W)w); 2346 ev_stop (EV_A_ (W)w);
2196} 2347}
2197#endif 2348#endif
2198 2349
… …
2287 ev_timer_set (&once->to, timeout, 0.); 2438 ev_timer_set (&once->to, timeout, 0.);
2288 ev_timer_start (EV_A_ &once->to); 2439 ev_timer_start (EV_A_ &once->to);
2289 } 2440 }
2290} 2441}
2291 2442
2443#if EV_MULTIPLICITY
2444 #include "ev_wrap.h"
2445#endif
2446
2292#ifdef __cplusplus 2447#ifdef __cplusplus
2293} 2448}
2294#endif 2449#endif
2295 2450

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines