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

Comparing libev/ev.c (file contents):
Revision 1.178 by root, Tue Dec 11 18:36:11 2007 UTC vs.
Revision 1.206 by root, Fri Jan 25 15:45:08 2008 UTC

2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * modification, are permitted provided that the following conditions are 8 * tion, are permitted provided that the following conditions are met:
9 * met: 9 *
10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE.
10 * 27 *
11 * * Redistributions of source code must retain the above copyright 28 * Alternatively, the contents of this file may be used under the terms of
12 * notice, this list of conditions and the following disclaimer. 29 * the GNU General Public License ("GPL") version 2 or any later version,
13 * 30 * in which case the provisions of the GPL are applicable instead of
14 * * Redistributions in binary form must reproduce the above 31 * the above. If you wish to allow the use of your version of this file
15 * copyright notice, this list of conditions and the following 32 * only under the terms of the GPL and not to allow others to use your
16 * disclaimer in the documentation and/or other materials provided 33 * version of this file under the BSD license, indicate your decision
17 * with the distribution. 34 * by deleting the provisions above and replace them with the notice
18 * 35 * and other provisions required by the GPL. If you do not delete the
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 36 * provisions above, a recipient may use your version of this file under
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 37 * either the BSD or the GPL.
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 38 */
31 39
32#ifdef __cplusplus 40#ifdef __cplusplus
33extern "C" { 41extern "C" {
34#endif 42#endif
51# ifndef EV_USE_MONOTONIC 59# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 60# define EV_USE_MONOTONIC 0
53# endif 61# endif
54# ifndef EV_USE_REALTIME 62# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 63# define EV_USE_REALTIME 0
64# endif
65# endif
66
67# ifndef EV_USE_NANOSLEEP
68# if HAVE_NANOSLEEP
69# define EV_USE_NANOSLEEP 1
70# else
71# define EV_USE_NANOSLEEP 0
56# endif 72# endif
57# endif 73# endif
58 74
59# ifndef EV_USE_SELECT 75# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 76# if HAVE_SELECT && HAVE_SYS_SELECT_H
146 162
147#ifndef EV_USE_REALTIME 163#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0 164# define EV_USE_REALTIME 0
149#endif 165#endif
150 166
167#ifndef EV_USE_NANOSLEEP
168# define EV_USE_NANOSLEEP 0
169#endif
170
151#ifndef EV_USE_SELECT 171#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 172# define EV_USE_SELECT 1
153#endif 173#endif
154 174
155#ifndef EV_USE_POLL 175#ifndef EV_USE_POLL
202#ifndef CLOCK_REALTIME 222#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 223# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 224# define EV_USE_REALTIME 0
205#endif 225#endif
206 226
227#if !EV_STAT_ENABLE
228# undef EV_USE_INOTIFY
229# define EV_USE_INOTIFY 0
230#endif
231
232#if !EV_USE_NANOSLEEP
233# ifndef _WIN32
234# include <sys/select.h>
235# endif
236#endif
237
238#if EV_USE_INOTIFY
239# include <sys/inotify.h>
240#endif
241
207#if EV_SELECT_IS_WINSOCKET 242#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 243# include <winsock.h>
209#endif
210
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 244#endif
218 245
219/**/ 246/**/
220 247
221/* 248/*
230 257
231#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) */
232#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) */
233/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 260/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
234 261
235#if __GNUC__ >= 3 262#if __GNUC__ >= 4
236# define expect(expr,value) __builtin_expect ((expr),(value)) 263# define expect(expr,value) __builtin_expect ((expr),(value))
237# define noinline __attribute__ ((noinline)) 264# define noinline __attribute__ ((noinline))
238#else 265#else
239# define expect(expr,value) (expr) 266# define expect(expr,value) (expr)
240# define noinline 267# define noinline
261 288
262typedef ev_watcher *W; 289typedef ev_watcher *W;
263typedef ev_watcher_list *WL; 290typedef ev_watcher_list *WL;
264typedef ev_watcher_time *WT; 291typedef ev_watcher_time *WT;
265 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 */
266static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 296static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
297#endif
267 298
268#ifdef _WIN32 299#ifdef _WIN32
269# include "ev_win32.c" 300# include "ev_win32.c"
270#endif 301#endif
271 302
407{ 438{
408 return ev_rt_now; 439 return ev_rt_now;
409} 440}
410#endif 441#endif
411 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
412int inline_size 470int inline_size
413array_nextsize (int elem, int cur, int cnt) 471array_nextsize (int elem, int cur, int cnt)
414{ 472{
415 int ncur = cur + 1; 473 int ncur = cur + 1;
416 474
476 pendings [pri][w_->pending - 1].w = w_; 534 pendings [pri][w_->pending - 1].w = w_;
477 pendings [pri][w_->pending - 1].events = revents; 535 pendings [pri][w_->pending - 1].events = revents;
478 } 536 }
479} 537}
480 538
481void inline_size 539void inline_speed
482queue_events (EV_P_ W *events, int eventcnt, int type) 540queue_events (EV_P_ W *events, int eventcnt, int type)
483{ 541{
484 int i; 542 int i;
485 543
486 for (i = 0; i < eventcnt; ++i) 544 for (i = 0; i < eventcnt; ++i)
533 { 591 {
534 int fd = fdchanges [i]; 592 int fd = fdchanges [i];
535 ANFD *anfd = anfds + fd; 593 ANFD *anfd = anfds + fd;
536 ev_io *w; 594 ev_io *w;
537 595
538 int events = 0; 596 unsigned char events = 0;
539 597
540 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)
541 events |= w->events; 599 events |= (unsigned char)w->events;
542 600
543#if EV_SELECT_IS_WINSOCKET 601#if EV_SELECT_IS_WINSOCKET
544 if (events) 602 if (events)
545 { 603 {
546 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
547 anfd->handle = _get_osfhandle (fd); 608 anfd->handle = _get_osfhandle (fd);
609 #endif
548 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));
549 } 611 }
550#endif 612#endif
551 613
614 {
615 unsigned char o_events = anfd->events;
616 unsigned char o_reify = anfd->reify;
617
552 anfd->reify = 0; 618 anfd->reify = 0;
553
554 backend_modify (EV_A_ fd, anfd->events, events);
555 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 }
556 } 624 }
557 625
558 fdchangecnt = 0; 626 fdchangecnt = 0;
559} 627}
560 628
561void inline_size 629void inline_size
562fd_change (EV_P_ int fd) 630fd_change (EV_P_ int fd, int flags)
563{ 631{
564 if (expect_false (anfds [fd].reify)) 632 unsigned char reify = anfds [fd].reify;
565 return;
566
567 anfds [fd].reify = 1; 633 anfds [fd].reify |= flags;
568 634
635 if (expect_true (!reify))
636 {
569 ++fdchangecnt; 637 ++fdchangecnt;
570 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 638 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
571 fdchanges [fdchangecnt - 1] = fd; 639 fdchanges [fdchangecnt - 1] = fd;
640 }
572} 641}
573 642
574void inline_speed 643void inline_speed
575fd_kill (EV_P_ int fd) 644fd_kill (EV_P_ int fd)
576{ 645{
627 696
628 for (fd = 0; fd < anfdmax; ++fd) 697 for (fd = 0; fd < anfdmax; ++fd)
629 if (anfds [fd].events) 698 if (anfds [fd].events)
630 { 699 {
631 anfds [fd].events = 0; 700 anfds [fd].events = 0;
632 fd_change (EV_A_ fd); 701 fd_change (EV_A_ fd, EV_IOFDSET | 1);
633 } 702 }
634} 703}
635 704
636/*****************************************************************************/ 705/*****************************************************************************/
637 706
638void inline_speed 707void inline_speed
639upheap (WT *heap, int k) 708upheap (WT *heap, int k)
640{ 709{
641 WT w = heap [k]; 710 WT w = heap [k];
642 711
643 while (k && heap [k >> 1]->at > w->at) 712 while (k)
644 { 713 {
714 int p = (k - 1) >> 1;
715
716 if (heap [p]->at <= w->at)
717 break;
718
645 heap [k] = heap [k >> 1]; 719 heap [k] = heap [p];
646 ((W)heap [k])->active = k + 1; 720 ((W)heap [k])->active = k + 1;
647 k >>= 1; 721 k = p;
648 } 722 }
649 723
650 heap [k] = w; 724 heap [k] = w;
651 ((W)heap [k])->active = k + 1; 725 ((W)heap [k])->active = k + 1;
652
653} 726}
654 727
655void inline_speed 728void inline_speed
656downheap (WT *heap, int N, int k) 729downheap (WT *heap, int N, int k)
657{ 730{
658 WT w = heap [k]; 731 WT w = heap [k];
659 732
660 while (k < (N >> 1)) 733 for (;;)
661 { 734 {
662 int j = k << 1; 735 int c = (k << 1) + 1;
663 736
664 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 737 if (c >= N)
665 ++j;
666
667 if (w->at <= heap [j]->at)
668 break; 738 break;
669 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
670 heap [k] = heap [j]; 746 heap [k] = heap [c];
671 ((W)heap [k])->active = k + 1; 747 ((W)heap [k])->active = k + 1;
748
672 k = j; 749 k = c;
673 } 750 }
674 751
675 heap [k] = w; 752 heap [k] = w;
676 ((W)heap [k])->active = k + 1; 753 ((W)heap [k])->active = k + 1;
677} 754}
784 ev_unref (EV_A); /* child watcher should not keep loop alive */ 861 ev_unref (EV_A); /* child watcher should not keep loop alive */
785} 862}
786 863
787/*****************************************************************************/ 864/*****************************************************************************/
788 865
789static ev_child *childs [EV_PID_HASHSIZE]; 866static WL childs [EV_PID_HASHSIZE];
790 867
791#ifndef _WIN32 868#ifndef _WIN32
792 869
793static ev_signal childev; 870static ev_signal childev;
871
872#ifndef WIFCONTINUED
873# define WIFCONTINUED(status) 0
874#endif
794 875
795void inline_speed 876void inline_speed
796child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 877child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
797{ 878{
798 ev_child *w; 879 ev_child *w;
880 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
799 881
800 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 882 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
883 {
801 if (w->pid == pid || !w->pid) 884 if ((w->pid == pid || !w->pid)
885 && (!traced || (w->flags & 1)))
802 { 886 {
803 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 887 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
804 w->rpid = pid; 888 w->rpid = pid;
805 w->rstatus = status; 889 w->rstatus = status;
806 ev_feed_event (EV_A_ (W)w, EV_CHILD); 890 ev_feed_event (EV_A_ (W)w, EV_CHILD);
807 } 891 }
892 }
808} 893}
809 894
810#ifndef WCONTINUED 895#ifndef WCONTINUED
811# define WCONTINUED 0 896# define WCONTINUED 0
812#endif 897#endif
909} 994}
910 995
911unsigned int 996unsigned int
912ev_embeddable_backends (void) 997ev_embeddable_backends (void)
913{ 998{
914 return EVBACKEND_EPOLL 999 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
915 | EVBACKEND_KQUEUE 1000
916 | EVBACKEND_PORT; 1001 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1002 /* please fix it and tell me how to detect the fix */
1003 flags &= ~EVBACKEND_EPOLL;
1004
1005 return flags;
917} 1006}
918 1007
919unsigned int 1008unsigned int
920ev_backend (EV_P) 1009ev_backend (EV_P)
921{ 1010{
924 1013
925unsigned int 1014unsigned int
926ev_loop_count (EV_P) 1015ev_loop_count (EV_P)
927{ 1016{
928 return loop_count; 1017 return loop_count;
1018}
1019
1020void
1021ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1022{
1023 io_blocktime = interval;
1024}
1025
1026void
1027ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1028{
1029 timeout_blocktime = interval;
929} 1030}
930 1031
931static void noinline 1032static void noinline
932loop_init (EV_P_ unsigned int flags) 1033loop_init (EV_P_ unsigned int flags)
933{ 1034{
944 ev_rt_now = ev_time (); 1045 ev_rt_now = ev_time ();
945 mn_now = get_clock (); 1046 mn_now = get_clock ();
946 now_floor = mn_now; 1047 now_floor = mn_now;
947 rtmn_diff = ev_rt_now - mn_now; 1048 rtmn_diff = ev_rt_now - mn_now;
948 1049
1050 io_blocktime = 0.;
1051 timeout_blocktime = 0.;
1052
949 /* pid check not overridable via env */ 1053 /* pid check not overridable via env */
950#ifndef _WIN32 1054#ifndef _WIN32
951 if (flags & EVFLAG_FORKCHECK) 1055 if (flags & EVFLAG_FORKCHECK)
952 curpid = getpid (); 1056 curpid = getpid ();
953#endif 1057#endif
1021 array_free (pending, [i]); 1125 array_free (pending, [i]);
1022#if EV_IDLE_ENABLE 1126#if EV_IDLE_ENABLE
1023 array_free (idle, [i]); 1127 array_free (idle, [i]);
1024#endif 1128#endif
1025 } 1129 }
1130
1131 ev_free (anfds); anfdmax = 0;
1026 1132
1027 /* have to use the microsoft-never-gets-it-right macro */ 1133 /* have to use the microsoft-never-gets-it-right macro */
1028 array_free (fdchange, EMPTY); 1134 array_free (fdchange, EMPTY);
1029 array_free (timer, EMPTY); 1135 array_free (timer, EMPTY);
1030#if EV_PERIODIC_ENABLE 1136#if EV_PERIODIC_ENABLE
1031 array_free (periodic, EMPTY); 1137 array_free (periodic, EMPTY);
1032#endif 1138#endif
1139#if EV_FORK_ENABLE
1140 array_free (fork, EMPTY);
1141#endif
1033 array_free (prepare, EMPTY); 1142 array_free (prepare, EMPTY);
1034 array_free (check, EMPTY); 1143 array_free (check, EMPTY);
1035 1144
1036 backend = 0; 1145 backend = 0;
1037} 1146}
1065 1174
1066 while (pipe (sigpipe)) 1175 while (pipe (sigpipe))
1067 syserr ("(libev) error creating pipe"); 1176 syserr ("(libev) error creating pipe");
1068 1177
1069 siginit (EV_A); 1178 siginit (EV_A);
1179 sigcb (EV_A_ &sigev, EV_READ);
1070 } 1180 }
1071 1181
1072 postfork = 0; 1182 postfork = 0;
1073} 1183}
1074 1184
1096} 1206}
1097 1207
1098void 1208void
1099ev_loop_fork (EV_P) 1209ev_loop_fork (EV_P)
1100{ 1210{
1101 postfork = 1; 1211 postfork = 1; /* must be in line with ev_default_fork */
1102} 1212}
1103 1213
1104#endif 1214#endif
1105 1215
1106#if EV_MULTIPLICITY 1216#if EV_MULTIPLICITY
1170#if EV_MULTIPLICITY 1280#if EV_MULTIPLICITY
1171 struct ev_loop *loop = ev_default_loop_ptr; 1281 struct ev_loop *loop = ev_default_loop_ptr;
1172#endif 1282#endif
1173 1283
1174 if (backend) 1284 if (backend)
1175 postfork = 1; 1285 postfork = 1; /* must be in line with ev_loop_fork */
1176} 1286}
1177 1287
1178/*****************************************************************************/ 1288/*****************************************************************************/
1179 1289
1180void 1290void
1206void inline_size 1316void inline_size
1207timers_reify (EV_P) 1317timers_reify (EV_P)
1208{ 1318{
1209 while (timercnt && ((WT)timers [0])->at <= mn_now) 1319 while (timercnt && ((WT)timers [0])->at <= mn_now)
1210 { 1320 {
1211 ev_timer *w = timers [0]; 1321 ev_timer *w = (ev_timer *)timers [0];
1212 1322
1213 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1323 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1214 1324
1215 /* first reschedule or stop timer */ 1325 /* first reschedule or stop timer */
1216 if (w->repeat) 1326 if (w->repeat)
1219 1329
1220 ((WT)w)->at += w->repeat; 1330 ((WT)w)->at += w->repeat;
1221 if (((WT)w)->at < mn_now) 1331 if (((WT)w)->at < mn_now)
1222 ((WT)w)->at = mn_now; 1332 ((WT)w)->at = mn_now;
1223 1333
1224 downheap ((WT *)timers, timercnt, 0); 1334 downheap (timers, timercnt, 0);
1225 } 1335 }
1226 else 1336 else
1227 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1337 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1228 1338
1229 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1339 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1234void inline_size 1344void inline_size
1235periodics_reify (EV_P) 1345periodics_reify (EV_P)
1236{ 1346{
1237 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1347 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1238 { 1348 {
1239 ev_periodic *w = periodics [0]; 1349 ev_periodic *w = (ev_periodic *)periodics [0];
1240 1350
1241 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1351 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1242 1352
1243 /* first reschedule or stop timer */ 1353 /* first reschedule or stop timer */
1244 if (w->reschedule_cb) 1354 if (w->reschedule_cb)
1245 { 1355 {
1246 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1356 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1247 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1357 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1248 downheap ((WT *)periodics, periodiccnt, 0); 1358 downheap (periodics, periodiccnt, 0);
1249 } 1359 }
1250 else if (w->interval) 1360 else if (w->interval)
1251 { 1361 {
1252 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1362 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1253 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval; 1363 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1254 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1364 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1255 downheap ((WT *)periodics, periodiccnt, 0); 1365 downheap (periodics, periodiccnt, 0);
1256 } 1366 }
1257 else 1367 else
1258 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1368 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1259 1369
1260 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1370 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1267 int i; 1377 int i;
1268 1378
1269 /* adjust periodics after time jump */ 1379 /* adjust periodics after time jump */
1270 for (i = 0; i < periodiccnt; ++i) 1380 for (i = 0; i < periodiccnt; ++i)
1271 { 1381 {
1272 ev_periodic *w = periodics [i]; 1382 ev_periodic *w = (ev_periodic *)periodics [i];
1273 1383
1274 if (w->reschedule_cb) 1384 if (w->reschedule_cb)
1275 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1385 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1276 else if (w->interval) 1386 else if (w->interval)
1277 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1387 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1278 } 1388 }
1279 1389
1280 /* now rebuild the heap */ 1390 /* now rebuild the heap */
1281 for (i = periodiccnt >> 1; i--; ) 1391 for (i = periodiccnt >> 1; i--; )
1282 downheap ((WT *)periodics, periodiccnt, i); 1392 downheap (periodics, periodiccnt, i);
1283} 1393}
1284#endif 1394#endif
1285 1395
1286#if EV_IDLE_ENABLE 1396#if EV_IDLE_ENABLE
1287void inline_size 1397void inline_size
1435 /* update fd-related kernel structures */ 1545 /* update fd-related kernel structures */
1436 fd_reify (EV_A); 1546 fd_reify (EV_A);
1437 1547
1438 /* calculate blocking time */ 1548 /* calculate blocking time */
1439 { 1549 {
1440 ev_tstamp block; 1550 ev_tstamp waittime = 0.;
1551 ev_tstamp sleeptime = 0.;
1441 1552
1442 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1553 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1443 block = 0.; /* do not block at all */
1444 else
1445 { 1554 {
1446 /* update time to cancel out callback processing overhead */ 1555 /* update time to cancel out callback processing overhead */
1447 time_update (EV_A_ 1e100); 1556 time_update (EV_A_ 1e100);
1448 1557
1449 block = MAX_BLOCKTIME; 1558 waittime = MAX_BLOCKTIME;
1450 1559
1451 if (timercnt) 1560 if (timercnt)
1452 { 1561 {
1453 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1562 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1454 if (block > to) block = to; 1563 if (waittime > to) waittime = to;
1455 } 1564 }
1456 1565
1457#if EV_PERIODIC_ENABLE 1566#if EV_PERIODIC_ENABLE
1458 if (periodiccnt) 1567 if (periodiccnt)
1459 { 1568 {
1460 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1569 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1461 if (block > to) block = to; 1570 if (waittime > to) waittime = to;
1462 } 1571 }
1463#endif 1572#endif
1464 1573
1465 if (expect_false (block < 0.)) block = 0.; 1574 if (expect_false (waittime < timeout_blocktime))
1575 waittime = timeout_blocktime;
1576
1577 sleeptime = waittime - backend_fudge;
1578
1579 if (expect_true (sleeptime > io_blocktime))
1580 sleeptime = io_blocktime;
1581
1582 if (sleeptime)
1583 {
1584 ev_sleep (sleeptime);
1585 waittime -= sleeptime;
1586 }
1466 } 1587 }
1467 1588
1468 ++loop_count; 1589 ++loop_count;
1469 backend_poll (EV_A_ block); 1590 backend_poll (EV_A_ waittime);
1470 1591
1471 /* update ev_rt_now, do magic */ 1592 /* update ev_rt_now, do magic */
1472 time_update (EV_A_ block); 1593 time_update (EV_A_ waittime + sleeptime);
1473 } 1594 }
1474 1595
1475 /* queue pending timers and reschedule them */ 1596 /* queue pending timers and reschedule them */
1476 timers_reify (EV_A); /* relative timers called last */ 1597 timers_reify (EV_A); /* relative timers called last */
1477#if EV_PERIODIC_ENABLE 1598#if EV_PERIODIC_ENABLE
1589 1710
1590 assert (("ev_io_start called with negative fd", fd >= 0)); 1711 assert (("ev_io_start called with negative fd", fd >= 0));
1591 1712
1592 ev_start (EV_A_ (W)w, 1); 1713 ev_start (EV_A_ (W)w, 1);
1593 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1714 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1594 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1715 wlist_add (&anfds[fd].head, (WL)w);
1595 1716
1596 fd_change (EV_A_ fd); 1717 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1718 w->events &= ~EV_IOFDSET;
1597} 1719}
1598 1720
1599void noinline 1721void noinline
1600ev_io_stop (EV_P_ ev_io *w) 1722ev_io_stop (EV_P_ ev_io *w)
1601{ 1723{
1603 if (expect_false (!ev_is_active (w))) 1725 if (expect_false (!ev_is_active (w)))
1604 return; 1726 return;
1605 1727
1606 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1728 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1607 1729
1608 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1730 wlist_del (&anfds[w->fd].head, (WL)w);
1609 ev_stop (EV_A_ (W)w); 1731 ev_stop (EV_A_ (W)w);
1610 1732
1611 fd_change (EV_A_ w->fd); 1733 fd_change (EV_A_ w->fd, 1);
1612} 1734}
1613 1735
1614void noinline 1736void noinline
1615ev_timer_start (EV_P_ ev_timer *w) 1737ev_timer_start (EV_P_ ev_timer *w)
1616{ 1738{
1620 ((WT)w)->at += mn_now; 1742 ((WT)w)->at += mn_now;
1621 1743
1622 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1744 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1623 1745
1624 ev_start (EV_A_ (W)w, ++timercnt); 1746 ev_start (EV_A_ (W)w, ++timercnt);
1625 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1747 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1626 timers [timercnt - 1] = w; 1748 timers [timercnt - 1] = (WT)w;
1627 upheap ((WT *)timers, timercnt - 1); 1749 upheap (timers, timercnt - 1);
1628 1750
1629 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1751 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1630} 1752}
1631 1753
1632void noinline 1754void noinline
1634{ 1756{
1635 clear_pending (EV_A_ (W)w); 1757 clear_pending (EV_A_ (W)w);
1636 if (expect_false (!ev_is_active (w))) 1758 if (expect_false (!ev_is_active (w)))
1637 return; 1759 return;
1638 1760
1639 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1761 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1640 1762
1641 { 1763 {
1642 int active = ((W)w)->active; 1764 int active = ((W)w)->active;
1643 1765
1644 if (expect_true (--active < --timercnt)) 1766 if (expect_true (--active < --timercnt))
1645 { 1767 {
1646 timers [active] = timers [timercnt]; 1768 timers [active] = timers [timercnt];
1647 adjustheap ((WT *)timers, timercnt, active); 1769 adjustheap (timers, timercnt, active);
1648 } 1770 }
1649 } 1771 }
1650 1772
1651 ((WT)w)->at -= mn_now; 1773 ((WT)w)->at -= mn_now;
1652 1774
1659 if (ev_is_active (w)) 1781 if (ev_is_active (w))
1660 { 1782 {
1661 if (w->repeat) 1783 if (w->repeat)
1662 { 1784 {
1663 ((WT)w)->at = mn_now + w->repeat; 1785 ((WT)w)->at = mn_now + w->repeat;
1664 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1786 adjustheap (timers, timercnt, ((W)w)->active - 1);
1665 } 1787 }
1666 else 1788 else
1667 ev_timer_stop (EV_A_ w); 1789 ev_timer_stop (EV_A_ w);
1668 } 1790 }
1669 else if (w->repeat) 1791 else if (w->repeat)
1690 } 1812 }
1691 else 1813 else
1692 ((WT)w)->at = w->offset; 1814 ((WT)w)->at = w->offset;
1693 1815
1694 ev_start (EV_A_ (W)w, ++periodiccnt); 1816 ev_start (EV_A_ (W)w, ++periodiccnt);
1695 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1817 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1696 periodics [periodiccnt - 1] = w; 1818 periodics [periodiccnt - 1] = (WT)w;
1697 upheap ((WT *)periodics, periodiccnt - 1); 1819 upheap (periodics, periodiccnt - 1);
1698 1820
1699 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1821 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1700} 1822}
1701 1823
1702void noinline 1824void noinline
1704{ 1826{
1705 clear_pending (EV_A_ (W)w); 1827 clear_pending (EV_A_ (W)w);
1706 if (expect_false (!ev_is_active (w))) 1828 if (expect_false (!ev_is_active (w)))
1707 return; 1829 return;
1708 1830
1709 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1831 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1710 1832
1711 { 1833 {
1712 int active = ((W)w)->active; 1834 int active = ((W)w)->active;
1713 1835
1714 if (expect_true (--active < --periodiccnt)) 1836 if (expect_true (--active < --periodiccnt))
1715 { 1837 {
1716 periodics [active] = periodics [periodiccnt]; 1838 periodics [active] = periodics [periodiccnt];
1717 adjustheap ((WT *)periodics, periodiccnt, active); 1839 adjustheap (periodics, periodiccnt, active);
1718 } 1840 }
1719 } 1841 }
1720 1842
1721 ev_stop (EV_A_ (W)w); 1843 ev_stop (EV_A_ (W)w);
1722} 1844}
1743 if (expect_false (ev_is_active (w))) 1865 if (expect_false (ev_is_active (w)))
1744 return; 1866 return;
1745 1867
1746 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1868 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1747 1869
1870 {
1871#ifndef _WIN32
1872 sigset_t full, prev;
1873 sigfillset (&full);
1874 sigprocmask (SIG_SETMASK, &full, &prev);
1875#endif
1876
1877 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1878
1879#ifndef _WIN32
1880 sigprocmask (SIG_SETMASK, &prev, 0);
1881#endif
1882 }
1883
1748 ev_start (EV_A_ (W)w, 1); 1884 ev_start (EV_A_ (W)w, 1);
1749 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1750 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1885 wlist_add (&signals [w->signum - 1].head, (WL)w);
1751 1886
1752 if (!((WL)w)->next) 1887 if (!((WL)w)->next)
1753 { 1888 {
1754#if _WIN32 1889#if _WIN32
1755 signal (w->signum, sighandler); 1890 signal (w->signum, sighandler);
1768{ 1903{
1769 clear_pending (EV_A_ (W)w); 1904 clear_pending (EV_A_ (W)w);
1770 if (expect_false (!ev_is_active (w))) 1905 if (expect_false (!ev_is_active (w)))
1771 return; 1906 return;
1772 1907
1773 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1908 wlist_del (&signals [w->signum - 1].head, (WL)w);
1774 ev_stop (EV_A_ (W)w); 1909 ev_stop (EV_A_ (W)w);
1775 1910
1776 if (!signals [w->signum - 1].head) 1911 if (!signals [w->signum - 1].head)
1777 signal (w->signum, SIG_DFL); 1912 signal (w->signum, SIG_DFL);
1778} 1913}
1785#endif 1920#endif
1786 if (expect_false (ev_is_active (w))) 1921 if (expect_false (ev_is_active (w)))
1787 return; 1922 return;
1788 1923
1789 ev_start (EV_A_ (W)w, 1); 1924 ev_start (EV_A_ (W)w, 1);
1790 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1925 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1791} 1926}
1792 1927
1793void 1928void
1794ev_child_stop (EV_P_ ev_child *w) 1929ev_child_stop (EV_P_ ev_child *w)
1795{ 1930{
1796 clear_pending (EV_A_ (W)w); 1931 clear_pending (EV_A_ (W)w);
1797 if (expect_false (!ev_is_active (w))) 1932 if (expect_false (!ev_is_active (w)))
1798 return; 1933 return;
1799 1934
1800 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1935 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1801 ev_stop (EV_A_ (W)w); 1936 ev_stop (EV_A_ (W)w);
1802} 1937}
1803 1938
1804#if EV_STAT_ENABLE 1939#if EV_STAT_ENABLE
1805 1940
2147 2282
2148#if EV_EMBED_ENABLE 2283#if EV_EMBED_ENABLE
2149void noinline 2284void noinline
2150ev_embed_sweep (EV_P_ ev_embed *w) 2285ev_embed_sweep (EV_P_ ev_embed *w)
2151{ 2286{
2152 ev_loop (w->loop, EVLOOP_NONBLOCK); 2287 ev_loop (w->other, EVLOOP_NONBLOCK);
2153} 2288}
2154 2289
2155static void 2290static void
2156embed_cb (EV_P_ ev_io *io, int revents) 2291embed_io_cb (EV_P_ ev_io *io, int revents)
2157{ 2292{
2158 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2293 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2159 2294
2160 if (ev_cb (w)) 2295 if (ev_cb (w))
2161 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2296 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2162 else 2297 else
2163 ev_embed_sweep (loop, w); 2298 ev_loop (w->other, EVLOOP_NONBLOCK);
2164} 2299}
2300
2301static void
2302embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2303{
2304 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2305
2306 {
2307 struct ev_loop *loop = w->other;
2308
2309 while (fdchangecnt)
2310 {
2311 fd_reify (EV_A);
2312 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2313 }
2314 }
2315}
2316
2317#if 0
2318static void
2319embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2320{
2321 ev_idle_stop (EV_A_ idle);
2322}
2323#endif
2165 2324
2166void 2325void
2167ev_embed_start (EV_P_ ev_embed *w) 2326ev_embed_start (EV_P_ ev_embed *w)
2168{ 2327{
2169 if (expect_false (ev_is_active (w))) 2328 if (expect_false (ev_is_active (w)))
2170 return; 2329 return;
2171 2330
2172 { 2331 {
2173 struct ev_loop *loop = w->loop; 2332 struct ev_loop *loop = w->other;
2174 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2333 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2175 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2334 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2176 } 2335 }
2177 2336
2178 ev_set_priority (&w->io, ev_priority (w)); 2337 ev_set_priority (&w->io, ev_priority (w));
2179 ev_io_start (EV_A_ &w->io); 2338 ev_io_start (EV_A_ &w->io);
2180 2339
2340 ev_prepare_init (&w->prepare, embed_prepare_cb);
2341 ev_set_priority (&w->prepare, EV_MINPRI);
2342 ev_prepare_start (EV_A_ &w->prepare);
2343
2344 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2345
2181 ev_start (EV_A_ (W)w, 1); 2346 ev_start (EV_A_ (W)w, 1);
2182} 2347}
2183 2348
2184void 2349void
2185ev_embed_stop (EV_P_ ev_embed *w) 2350ev_embed_stop (EV_P_ ev_embed *w)
2187 clear_pending (EV_A_ (W)w); 2352 clear_pending (EV_A_ (W)w);
2188 if (expect_false (!ev_is_active (w))) 2353 if (expect_false (!ev_is_active (w)))
2189 return; 2354 return;
2190 2355
2191 ev_io_stop (EV_A_ &w->io); 2356 ev_io_stop (EV_A_ &w->io);
2357 ev_prepare_stop (EV_A_ &w->prepare);
2192 2358
2193 ev_stop (EV_A_ (W)w); 2359 ev_stop (EV_A_ (W)w);
2194} 2360}
2195#endif 2361#endif
2196 2362
2285 ev_timer_set (&once->to, timeout, 0.); 2451 ev_timer_set (&once->to, timeout, 0.);
2286 ev_timer_start (EV_A_ &once->to); 2452 ev_timer_start (EV_A_ &once->to);
2287 } 2453 }
2288} 2454}
2289 2455
2456#if EV_MULTIPLICITY
2457 #include "ev_wrap.h"
2458#endif
2459
2290#ifdef __cplusplus 2460#ifdef __cplusplus
2291} 2461}
2292#endif 2462#endif
2293 2463

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines