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

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

Diff Legend

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