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

Diff Legend

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