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

Comparing libev/ev.c (file contents):
Revision 1.179 by root, Tue Dec 11 21:04:40 2007 UTC vs.
Revision 1.205 by root, Sun Jan 20 15:37:03 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
… …
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
… …
652 k = p; 721 k = p;
653 } 722 }
654 723
655 heap [k] = w; 724 heap [k] = w;
656 ((W)heap [k])->active = k + 1; 725 ((W)heap [k])->active = k + 1;
657
658} 726}
659 727
660void inline_speed 728void inline_speed
661downheap (WT *heap, int N, int k) 729downheap (WT *heap, int N, int k)
662{ 730{
… …
793 ev_unref (EV_A); /* child watcher should not keep loop alive */ 861 ev_unref (EV_A); /* child watcher should not keep loop alive */
794} 862}
795 863
796/*****************************************************************************/ 864/*****************************************************************************/
797 865
798static ev_child *childs [EV_PID_HASHSIZE]; 866static WL childs [EV_PID_HASHSIZE];
799 867
800#ifndef _WIN32 868#ifndef _WIN32
801 869
802static ev_signal childev; 870static ev_signal childev;
803 871
… …
918} 986}
919 987
920unsigned int 988unsigned int
921ev_embeddable_backends (void) 989ev_embeddable_backends (void)
922{ 990{
923 return EVBACKEND_EPOLL 991 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
924 | EVBACKEND_KQUEUE 992
925 | 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;
926} 998}
927 999
928unsigned int 1000unsigned int
929ev_backend (EV_P) 1001ev_backend (EV_P)
930{ 1002{
… …
933 1005
934unsigned int 1006unsigned int
935ev_loop_count (EV_P) 1007ev_loop_count (EV_P)
936{ 1008{
937 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;
938} 1022}
939 1023
940static void noinline 1024static void noinline
941loop_init (EV_P_ unsigned int flags) 1025loop_init (EV_P_ unsigned int flags)
942{ 1026{
… …
953 ev_rt_now = ev_time (); 1037 ev_rt_now = ev_time ();
954 mn_now = get_clock (); 1038 mn_now = get_clock ();
955 now_floor = mn_now; 1039 now_floor = mn_now;
956 rtmn_diff = ev_rt_now - mn_now; 1040 rtmn_diff = ev_rt_now - mn_now;
957 1041
1042 io_blocktime = 0.;
1043 timeout_blocktime = 0.;
1044
958 /* pid check not overridable via env */ 1045 /* pid check not overridable via env */
959#ifndef _WIN32 1046#ifndef _WIN32
960 if (flags & EVFLAG_FORKCHECK) 1047 if (flags & EVFLAG_FORKCHECK)
961 curpid = getpid (); 1048 curpid = getpid ();
962#endif 1049#endif
… …
1030 array_free (pending, [i]); 1117 array_free (pending, [i]);
1031#if EV_IDLE_ENABLE 1118#if EV_IDLE_ENABLE
1032 array_free (idle, [i]); 1119 array_free (idle, [i]);
1033#endif 1120#endif
1034 } 1121 }
1122
1123 ev_free (anfds); anfdmax = 0;
1035 1124
1036 /* have to use the microsoft-never-gets-it-right macro */ 1125 /* have to use the microsoft-never-gets-it-right macro */
1037 array_free (fdchange, EMPTY); 1126 array_free (fdchange, EMPTY);
1038 array_free (timer, EMPTY); 1127 array_free (timer, EMPTY);
1039#if EV_PERIODIC_ENABLE 1128#if EV_PERIODIC_ENABLE
1040 array_free (periodic, EMPTY); 1129 array_free (periodic, EMPTY);
1041#endif 1130#endif
1131#if EV_FORK_ENABLE
1132 array_free (fork, EMPTY);
1133#endif
1042 array_free (prepare, EMPTY); 1134 array_free (prepare, EMPTY);
1043 array_free (check, EMPTY); 1135 array_free (check, EMPTY);
1044 1136
1045 backend = 0; 1137 backend = 0;
1046} 1138}
… …
1074 1166
1075 while (pipe (sigpipe)) 1167 while (pipe (sigpipe))
1076 syserr ("(libev) error creating pipe"); 1168 syserr ("(libev) error creating pipe");
1077 1169
1078 siginit (EV_A); 1170 siginit (EV_A);
1171 sigcb (EV_A_ &sigev, EV_READ);
1079 } 1172 }
1080 1173
1081 postfork = 0; 1174 postfork = 0;
1082} 1175}
1083 1176
… …
1105} 1198}
1106 1199
1107void 1200void
1108ev_loop_fork (EV_P) 1201ev_loop_fork (EV_P)
1109{ 1202{
1110 postfork = 1; 1203 postfork = 1; /* must be in line with ev_default_fork */
1111} 1204}
1112 1205
1113#endif 1206#endif
1114 1207
1115#if EV_MULTIPLICITY 1208#if EV_MULTIPLICITY
… …
1179#if EV_MULTIPLICITY 1272#if EV_MULTIPLICITY
1180 struct ev_loop *loop = ev_default_loop_ptr; 1273 struct ev_loop *loop = ev_default_loop_ptr;
1181#endif 1274#endif
1182 1275
1183 if (backend) 1276 if (backend)
1184 postfork = 1; 1277 postfork = 1; /* must be in line with ev_loop_fork */
1185} 1278}
1186 1279
1187/*****************************************************************************/ 1280/*****************************************************************************/
1188 1281
1189void 1282void
… …
1215void inline_size 1308void inline_size
1216timers_reify (EV_P) 1309timers_reify (EV_P)
1217{ 1310{
1218 while (timercnt && ((WT)timers [0])->at <= mn_now) 1311 while (timercnt && ((WT)timers [0])->at <= mn_now)
1219 { 1312 {
1220 ev_timer *w = timers [0]; 1313 ev_timer *w = (ev_timer *)timers [0];
1221 1314
1222 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1315 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1223 1316
1224 /* first reschedule or stop timer */ 1317 /* first reschedule or stop timer */
1225 if (w->repeat) 1318 if (w->repeat)
… …
1228 1321
1229 ((WT)w)->at += w->repeat; 1322 ((WT)w)->at += w->repeat;
1230 if (((WT)w)->at < mn_now) 1323 if (((WT)w)->at < mn_now)
1231 ((WT)w)->at = mn_now; 1324 ((WT)w)->at = mn_now;
1232 1325
1233 downheap ((WT *)timers, timercnt, 0); 1326 downheap (timers, timercnt, 0);
1234 } 1327 }
1235 else 1328 else
1236 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1329 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1237 1330
1238 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1331 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1243void inline_size 1336void inline_size
1244periodics_reify (EV_P) 1337periodics_reify (EV_P)
1245{ 1338{
1246 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1339 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1247 { 1340 {
1248 ev_periodic *w = periodics [0]; 1341 ev_periodic *w = (ev_periodic *)periodics [0];
1249 1342
1250 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1343 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1251 1344
1252 /* first reschedule or stop timer */ 1345 /* first reschedule or stop timer */
1253 if (w->reschedule_cb) 1346 if (w->reschedule_cb)
1254 { 1347 {
1255 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1348 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1256 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));
1257 downheap ((WT *)periodics, periodiccnt, 0); 1350 downheap (periodics, periodiccnt, 0);
1258 } 1351 }
1259 else if (w->interval) 1352 else if (w->interval)
1260 { 1353 {
1261 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1354 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1262 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval; 1355 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1263 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));
1264 downheap ((WT *)periodics, periodiccnt, 0); 1357 downheap (periodics, periodiccnt, 0);
1265 } 1358 }
1266 else 1359 else
1267 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1360 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1268 1361
1269 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1362 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1276 int i; 1369 int i;
1277 1370
1278 /* adjust periodics after time jump */ 1371 /* adjust periodics after time jump */
1279 for (i = 0; i < periodiccnt; ++i) 1372 for (i = 0; i < periodiccnt; ++i)
1280 { 1373 {
1281 ev_periodic *w = periodics [i]; 1374 ev_periodic *w = (ev_periodic *)periodics [i];
1282 1375
1283 if (w->reschedule_cb) 1376 if (w->reschedule_cb)
1284 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1377 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1285 else if (w->interval) 1378 else if (w->interval)
1286 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1379 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1287 } 1380 }
1288 1381
1289 /* now rebuild the heap */ 1382 /* now rebuild the heap */
1290 for (i = periodiccnt >> 1; i--; ) 1383 for (i = periodiccnt >> 1; i--; )
1291 downheap ((WT *)periodics, periodiccnt, i); 1384 downheap (periodics, periodiccnt, i);
1292} 1385}
1293#endif 1386#endif
1294 1387
1295#if EV_IDLE_ENABLE 1388#if EV_IDLE_ENABLE
1296void inline_size 1389void inline_size
… …
1444 /* update fd-related kernel structures */ 1537 /* update fd-related kernel structures */
1445 fd_reify (EV_A); 1538 fd_reify (EV_A);
1446 1539
1447 /* calculate blocking time */ 1540 /* calculate blocking time */
1448 { 1541 {
1449 ev_tstamp block; 1542 ev_tstamp waittime = 0.;
1543 ev_tstamp sleeptime = 0.;
1450 1544
1451 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1545 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1452 block = 0.; /* do not block at all */
1453 else
1454 { 1546 {
1455 /* update time to cancel out callback processing overhead */ 1547 /* update time to cancel out callback processing overhead */
1456 time_update (EV_A_ 1e100); 1548 time_update (EV_A_ 1e100);
1457 1549
1458 block = MAX_BLOCKTIME; 1550 waittime = MAX_BLOCKTIME;
1459 1551
1460 if (timercnt) 1552 if (timercnt)
1461 { 1553 {
1462 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1554 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1463 if (block > to) block = to; 1555 if (waittime > to) waittime = to;
1464 } 1556 }
1465 1557
1466#if EV_PERIODIC_ENABLE 1558#if EV_PERIODIC_ENABLE
1467 if (periodiccnt) 1559 if (periodiccnt)
1468 { 1560 {
1469 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;
1470 if (block > to) block = to; 1562 if (waittime > to) waittime = to;
1471 } 1563 }
1472#endif 1564#endif
1473 1565
1474 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 }
1475 } 1579 }
1476 1580
1477 ++loop_count; 1581 ++loop_count;
1478 backend_poll (EV_A_ block); 1582 backend_poll (EV_A_ waittime);
1479 1583
1480 /* update ev_rt_now, do magic */ 1584 /* update ev_rt_now, do magic */
1481 time_update (EV_A_ block); 1585 time_update (EV_A_ waittime + sleeptime);
1482 } 1586 }
1483 1587
1484 /* queue pending timers and reschedule them */ 1588 /* queue pending timers and reschedule them */
1485 timers_reify (EV_A); /* relative timers called last */ 1589 timers_reify (EV_A); /* relative timers called last */
1486#if EV_PERIODIC_ENABLE 1590#if EV_PERIODIC_ENABLE
… …
1598 1702
1599 assert (("ev_io_start called with negative fd", fd >= 0)); 1703 assert (("ev_io_start called with negative fd", fd >= 0));
1600 1704
1601 ev_start (EV_A_ (W)w, 1); 1705 ev_start (EV_A_ (W)w, 1);
1602 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1706 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1603 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1707 wlist_add (&anfds[fd].head, (WL)w);
1604 1708
1605 fd_change (EV_A_ fd); 1709 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1710 w->events &= ~EV_IOFDSET;
1606} 1711}
1607 1712
1608void noinline 1713void noinline
1609ev_io_stop (EV_P_ ev_io *w) 1714ev_io_stop (EV_P_ ev_io *w)
1610{ 1715{
… …
1612 if (expect_false (!ev_is_active (w))) 1717 if (expect_false (!ev_is_active (w)))
1613 return; 1718 return;
1614 1719
1615 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));
1616 1721
1617 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1722 wlist_del (&anfds[w->fd].head, (WL)w);
1618 ev_stop (EV_A_ (W)w); 1723 ev_stop (EV_A_ (W)w);
1619 1724
1620 fd_change (EV_A_ w->fd); 1725 fd_change (EV_A_ w->fd, 1);
1621} 1726}
1622 1727
1623void noinline 1728void noinline
1624ev_timer_start (EV_P_ ev_timer *w) 1729ev_timer_start (EV_P_ ev_timer *w)
1625{ 1730{
… …
1629 ((WT)w)->at += mn_now; 1734 ((WT)w)->at += mn_now;
1630 1735
1631 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.));
1632 1737
1633 ev_start (EV_A_ (W)w, ++timercnt); 1738 ev_start (EV_A_ (W)w, ++timercnt);
1634 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1739 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1635 timers [timercnt - 1] = w; 1740 timers [timercnt - 1] = (WT)w;
1636 upheap ((WT *)timers, timercnt - 1); 1741 upheap (timers, timercnt - 1);
1637 1742
1638 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1743 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1639} 1744}
1640 1745
1641void noinline 1746void noinline
… …
1643{ 1748{
1644 clear_pending (EV_A_ (W)w); 1749 clear_pending (EV_A_ (W)w);
1645 if (expect_false (!ev_is_active (w))) 1750 if (expect_false (!ev_is_active (w)))
1646 return; 1751 return;
1647 1752
1648 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1753 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1649 1754
1650 { 1755 {
1651 int active = ((W)w)->active; 1756 int active = ((W)w)->active;
1652 1757
1653 if (expect_true (--active < --timercnt)) 1758 if (expect_true (--active < --timercnt))
1654 { 1759 {
1655 timers [active] = timers [timercnt]; 1760 timers [active] = timers [timercnt];
1656 adjustheap ((WT *)timers, timercnt, active); 1761 adjustheap (timers, timercnt, active);
1657 } 1762 }
1658 } 1763 }
1659 1764
1660 ((WT)w)->at -= mn_now; 1765 ((WT)w)->at -= mn_now;
1661 1766
… …
1668 if (ev_is_active (w)) 1773 if (ev_is_active (w))
1669 { 1774 {
1670 if (w->repeat) 1775 if (w->repeat)
1671 { 1776 {
1672 ((WT)w)->at = mn_now + w->repeat; 1777 ((WT)w)->at = mn_now + w->repeat;
1673 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1778 adjustheap (timers, timercnt, ((W)w)->active - 1);
1674 } 1779 }
1675 else 1780 else
1676 ev_timer_stop (EV_A_ w); 1781 ev_timer_stop (EV_A_ w);
1677 } 1782 }
1678 else if (w->repeat) 1783 else if (w->repeat)
… …
1699 } 1804 }
1700 else 1805 else
1701 ((WT)w)->at = w->offset; 1806 ((WT)w)->at = w->offset;
1702 1807
1703 ev_start (EV_A_ (W)w, ++periodiccnt); 1808 ev_start (EV_A_ (W)w, ++periodiccnt);
1704 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1809 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1705 periodics [periodiccnt - 1] = w; 1810 periodics [periodiccnt - 1] = (WT)w;
1706 upheap ((WT *)periodics, periodiccnt - 1); 1811 upheap (periodics, periodiccnt - 1);
1707 1812
1708 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1813 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1709} 1814}
1710 1815
1711void noinline 1816void noinline
… …
1713{ 1818{
1714 clear_pending (EV_A_ (W)w); 1819 clear_pending (EV_A_ (W)w);
1715 if (expect_false (!ev_is_active (w))) 1820 if (expect_false (!ev_is_active (w)))
1716 return; 1821 return;
1717 1822
1718 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1823 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1719 1824
1720 { 1825 {
1721 int active = ((W)w)->active; 1826 int active = ((W)w)->active;
1722 1827
1723 if (expect_true (--active < --periodiccnt)) 1828 if (expect_true (--active < --periodiccnt))
1724 { 1829 {
1725 periodics [active] = periodics [periodiccnt]; 1830 periodics [active] = periodics [periodiccnt];
1726 adjustheap ((WT *)periodics, periodiccnt, active); 1831 adjustheap (periodics, periodiccnt, active);
1727 } 1832 }
1728 } 1833 }
1729 1834
1730 ev_stop (EV_A_ (W)w); 1835 ev_stop (EV_A_ (W)w);
1731} 1836}
… …
1752 if (expect_false (ev_is_active (w))) 1857 if (expect_false (ev_is_active (w)))
1753 return; 1858 return;
1754 1859
1755 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));
1756 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
1757 ev_start (EV_A_ (W)w, 1); 1876 ev_start (EV_A_ (W)w, 1);
1758 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1759 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1877 wlist_add (&signals [w->signum - 1].head, (WL)w);
1760 1878
1761 if (!((WL)w)->next) 1879 if (!((WL)w)->next)
1762 { 1880 {
1763#if _WIN32 1881#if _WIN32
1764 signal (w->signum, sighandler); 1882 signal (w->signum, sighandler);
… …
1777{ 1895{
1778 clear_pending (EV_A_ (W)w); 1896 clear_pending (EV_A_ (W)w);
1779 if (expect_false (!ev_is_active (w))) 1897 if (expect_false (!ev_is_active (w)))
1780 return; 1898 return;
1781 1899
1782 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1900 wlist_del (&signals [w->signum - 1].head, (WL)w);
1783 ev_stop (EV_A_ (W)w); 1901 ev_stop (EV_A_ (W)w);
1784 1902
1785 if (!signals [w->signum - 1].head) 1903 if (!signals [w->signum - 1].head)
1786 signal (w->signum, SIG_DFL); 1904 signal (w->signum, SIG_DFL);
1787} 1905}
… …
1794#endif 1912#endif
1795 if (expect_false (ev_is_active (w))) 1913 if (expect_false (ev_is_active (w)))
1796 return; 1914 return;
1797 1915
1798 ev_start (EV_A_ (W)w, 1); 1916 ev_start (EV_A_ (W)w, 1);
1799 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1917 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1800} 1918}
1801 1919
1802void 1920void
1803ev_child_stop (EV_P_ ev_child *w) 1921ev_child_stop (EV_P_ ev_child *w)
1804{ 1922{
1805 clear_pending (EV_A_ (W)w); 1923 clear_pending (EV_A_ (W)w);
1806 if (expect_false (!ev_is_active (w))) 1924 if (expect_false (!ev_is_active (w)))
1807 return; 1925 return;
1808 1926
1809 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1927 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1810 ev_stop (EV_A_ (W)w); 1928 ev_stop (EV_A_ (W)w);
1811} 1929}
1812 1930
1813#if EV_STAT_ENABLE 1931#if EV_STAT_ENABLE
1814 1932
… …
2156 2274
2157#if EV_EMBED_ENABLE 2275#if EV_EMBED_ENABLE
2158void noinline 2276void noinline
2159ev_embed_sweep (EV_P_ ev_embed *w) 2277ev_embed_sweep (EV_P_ ev_embed *w)
2160{ 2278{
2161 ev_loop (w->loop, EVLOOP_NONBLOCK); 2279 ev_loop (w->other, EVLOOP_NONBLOCK);
2162} 2280}
2163 2281
2164static void 2282static void
2165embed_cb (EV_P_ ev_io *io, int revents) 2283embed_io_cb (EV_P_ ev_io *io, int revents)
2166{ 2284{
2167 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2285 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2168 2286
2169 if (ev_cb (w)) 2287 if (ev_cb (w))
2170 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2288 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2171 else 2289 else
2172 ev_embed_sweep (loop, w); 2290 ev_loop (w->other, EVLOOP_NONBLOCK);
2173} 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
2174 2316
2175void 2317void
2176ev_embed_start (EV_P_ ev_embed *w) 2318ev_embed_start (EV_P_ ev_embed *w)
2177{ 2319{
2178 if (expect_false (ev_is_active (w))) 2320 if (expect_false (ev_is_active (w)))
2179 return; 2321 return;
2180 2322
2181 { 2323 {
2182 struct ev_loop *loop = w->loop; 2324 struct ev_loop *loop = w->other;
2183 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 ()));
2184 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2326 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2185 } 2327 }
2186 2328
2187 ev_set_priority (&w->io, ev_priority (w)); 2329 ev_set_priority (&w->io, ev_priority (w));
2188 ev_io_start (EV_A_ &w->io); 2330 ev_io_start (EV_A_ &w->io);
2189 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
2190 ev_start (EV_A_ (W)w, 1); 2338 ev_start (EV_A_ (W)w, 1);
2191} 2339}
2192 2340
2193void 2341void
2194ev_embed_stop (EV_P_ ev_embed *w) 2342ev_embed_stop (EV_P_ ev_embed *w)
… …
2196 clear_pending (EV_A_ (W)w); 2344 clear_pending (EV_A_ (W)w);
2197 if (expect_false (!ev_is_active (w))) 2345 if (expect_false (!ev_is_active (w)))
2198 return; 2346 return;
2199 2347
2200 ev_io_stop (EV_A_ &w->io); 2348 ev_io_stop (EV_A_ &w->io);
2349 ev_prepare_stop (EV_A_ &w->prepare);
2201 2350
2202 ev_stop (EV_A_ (W)w); 2351 ev_stop (EV_A_ (W)w);
2203} 2352}
2204#endif 2353#endif
2205 2354
… …
2294 ev_timer_set (&once->to, timeout, 0.); 2443 ev_timer_set (&once->to, timeout, 0.);
2295 ev_timer_start (EV_A_ &once->to); 2444 ev_timer_start (EV_A_ &once->to);
2296 } 2445 }
2297} 2446}
2298 2447
2448#if EV_MULTIPLICITY
2449 #include "ev_wrap.h"
2450#endif
2451
2299#ifdef __cplusplus 2452#ifdef __cplusplus
2300} 2453}
2301#endif 2454#endif
2302 2455

Diff Legend

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