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

Comparing libev/ev.c (file contents):
Revision 1.176 by root, Tue Dec 11 04:31:55 2007 UTC vs.
Revision 1.197 by root, Sat Dec 22 15:20:13 2007 UTC

… …
51# ifndef EV_USE_MONOTONIC 51# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 52# define EV_USE_MONOTONIC 0
53# endif 53# endif
54# ifndef EV_USE_REALTIME 54# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 55# define EV_USE_REALTIME 0
56# endif
57# endif
58
59# ifndef EV_USE_NANOSLEEP
60# if HAVE_NANOSLEEP
61# define EV_USE_NANOSLEEP 1
62# else
63# define EV_USE_NANOSLEEP 0
56# endif 64# endif
57# endif 65# endif
58 66
59# ifndef EV_USE_SELECT 67# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 68# if HAVE_SELECT && HAVE_SYS_SELECT_H
… …
146 154
147#ifndef EV_USE_REALTIME 155#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0 156# define EV_USE_REALTIME 0
149#endif 157#endif
150 158
159#ifndef EV_USE_NANOSLEEP
160# define EV_USE_NANOSLEEP 0
161#endif
162
151#ifndef EV_USE_SELECT 163#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 164# define EV_USE_SELECT 1
153#endif 165#endif
154 166
155#ifndef EV_USE_POLL 167#ifndef EV_USE_POLL
… …
202#ifndef CLOCK_REALTIME 214#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 215# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 216# define EV_USE_REALTIME 0
205#endif 217#endif
206 218
219#if !EV_STAT_ENABLE
220# undef EV_USE_INOTIFY
221# define EV_USE_INOTIFY 0
222#endif
223
224#if !EV_USE_NANOSLEEP
225# ifndef _WIN32
226# include <sys/select.h>
227# endif
228#endif
229
230#if EV_USE_INOTIFY
231# include <sys/inotify.h>
232#endif
233
207#if EV_SELECT_IS_WINSOCKET 234#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 235# 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 236#endif
218 237
219/**/ 238/**/
220 239
221/* 240/*
222 * This is used to avoid floating point rounding problems. 241 * This is used to avoid floating point rounding problems.
223 * It is added to ev_rt_now when scheduling periodics 242 * It is added to ev_rt_now when scheduling periodics
224 * to ensure progress, time-wise, even when rounding 243 * to ensure progress, time-wise, even when rounding
225 * errors are against us. 244 * errors are against us.
226 * This value is good at least till the year 4000 245 * This value is good at least till the year 4000.
227 * and intervals up to 20 years.
228 * Better solutions welcome. 246 * Better solutions welcome.
229 */ 247 */
230#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 248#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
231 249
232#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 250#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
233#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 251#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
234/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 252/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
235 253
236#if __GNUC__ >= 3 254#if __GNUC__ >= 4
237# define expect(expr,value) __builtin_expect ((expr),(value)) 255# define expect(expr,value) __builtin_expect ((expr),(value))
238# define noinline __attribute__ ((noinline)) 256# define noinline __attribute__ ((noinline))
239#else 257#else
240# define expect(expr,value) (expr) 258# define expect(expr,value) (expr)
241# define noinline 259# define noinline
… …
262 280
263typedef ev_watcher *W; 281typedef ev_watcher *W;
264typedef ev_watcher_list *WL; 282typedef ev_watcher_list *WL;
265typedef ev_watcher_time *WT; 283typedef ev_watcher_time *WT;
266 284
285/* sig_atomic_t is used to avoid per-thread variables or locking but still */
286/* giving it a reasonably high chance of working on typical architetcures */
267static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 287static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
268 288
269#ifdef _WIN32 289#ifdef _WIN32
270# include "ev_win32.c" 290# include "ev_win32.c"
271#endif 291#endif
272 292
… …
408{ 428{
409 return ev_rt_now; 429 return ev_rt_now;
410} 430}
411#endif 431#endif
412 432
433void
434ev_sleep (ev_tstamp delay)
435{
436 if (delay > 0.)
437 {
438#if EV_USE_NANOSLEEP
439 struct timespec ts;
440
441 ts.tv_sec = (time_t)delay;
442 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
443
444 nanosleep (&ts, 0);
445#elif defined(_WIN32)
446 Sleep (delay * 1e3);
447#else
448 struct timeval tv;
449
450 tv.tv_sec = (time_t)delay;
451 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
452
453 select (0, 0, 0, 0, &tv);
454#endif
455 }
456}
457
458/*****************************************************************************/
459
413int inline_size 460int inline_size
414array_nextsize (int elem, int cur, int cnt) 461array_nextsize (int elem, int cur, int cnt)
415{ 462{
416 int ncur = cur + 1; 463 int ncur = cur + 1;
417 464
… …
477 pendings [pri][w_->pending - 1].w = w_; 524 pendings [pri][w_->pending - 1].w = w_;
478 pendings [pri][w_->pending - 1].events = revents; 525 pendings [pri][w_->pending - 1].events = revents;
479 } 526 }
480} 527}
481 528
482void inline_size 529void inline_speed
483queue_events (EV_P_ W *events, int eventcnt, int type) 530queue_events (EV_P_ W *events, int eventcnt, int type)
484{ 531{
485 int i; 532 int i;
486 533
487 for (i = 0; i < eventcnt; ++i) 534 for (i = 0; i < eventcnt; ++i)
… …
534 { 581 {
535 int fd = fdchanges [i]; 582 int fd = fdchanges [i];
536 ANFD *anfd = anfds + fd; 583 ANFD *anfd = anfds + fd;
537 ev_io *w; 584 ev_io *w;
538 585
539 int events = 0; 586 unsigned char events = 0;
540 587
541 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 588 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
542 events |= w->events; 589 events |= (unsigned char)w->events;
543 590
544#if EV_SELECT_IS_WINSOCKET 591#if EV_SELECT_IS_WINSOCKET
545 if (events) 592 if (events)
546 { 593 {
547 unsigned long argp; 594 unsigned long argp;
548 anfd->handle = _get_osfhandle (fd); 595 anfd->handle = _get_osfhandle (fd);
549 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 596 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
550 } 597 }
551#endif 598#endif
552 599
600 {
601 unsigned char o_events = anfd->events;
602 unsigned char o_reify = anfd->reify;
603
553 anfd->reify = 0; 604 anfd->reify = 0;
554
555 backend_modify (EV_A_ fd, anfd->events, events);
556 anfd->events = events; 605 anfd->events = events;
606
607 if (o_events != events || o_reify & EV_IOFDSET)
608 backend_modify (EV_A_ fd, o_events, events);
609 }
557 } 610 }
558 611
559 fdchangecnt = 0; 612 fdchangecnt = 0;
560} 613}
561 614
562void inline_size 615void inline_size
563fd_change (EV_P_ int fd) 616fd_change (EV_P_ int fd, int flags)
564{ 617{
565 if (expect_false (anfds [fd].reify)) 618 unsigned char reify = anfds [fd].reify;
566 return;
567
568 anfds [fd].reify = 1; 619 anfds [fd].reify |= flags;
569 620
621 if (expect_true (!reify))
622 {
570 ++fdchangecnt; 623 ++fdchangecnt;
571 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 624 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
572 fdchanges [fdchangecnt - 1] = fd; 625 fdchanges [fdchangecnt - 1] = fd;
626 }
573} 627}
574 628
575void inline_speed 629void inline_speed
576fd_kill (EV_P_ int fd) 630fd_kill (EV_P_ int fd)
577{ 631{
… …
628 682
629 for (fd = 0; fd < anfdmax; ++fd) 683 for (fd = 0; fd < anfdmax; ++fd)
630 if (anfds [fd].events) 684 if (anfds [fd].events)
631 { 685 {
632 anfds [fd].events = 0; 686 anfds [fd].events = 0;
633 fd_change (EV_A_ fd); 687 fd_change (EV_A_ fd, EV_IOFDSET | 1);
634 } 688 }
635} 689}
636 690
637/*****************************************************************************/ 691/*****************************************************************************/
638 692
639void inline_speed 693void inline_speed
640upheap (WT *heap, int k) 694upheap (WT *heap, int k)
641{ 695{
642 WT w = heap [k]; 696 WT w = heap [k];
643 697
644 while (k && heap [k >> 1]->at > w->at) 698 while (k)
645 { 699 {
700 int p = (k - 1) >> 1;
701
702 if (heap [p]->at <= w->at)
703 break;
704
646 heap [k] = heap [k >> 1]; 705 heap [k] = heap [p];
647 ((W)heap [k])->active = k + 1; 706 ((W)heap [k])->active = k + 1;
648 k >>= 1; 707 k = p;
649 } 708 }
650 709
651 heap [k] = w; 710 heap [k] = w;
652 ((W)heap [k])->active = k + 1; 711 ((W)heap [k])->active = k + 1;
653
654} 712}
655 713
656void inline_speed 714void inline_speed
657downheap (WT *heap, int N, int k) 715downheap (WT *heap, int N, int k)
658{ 716{
659 WT w = heap [k]; 717 WT w = heap [k];
660 718
661 while (k < (N >> 1)) 719 for (;;)
662 { 720 {
663 int j = k << 1; 721 int c = (k << 1) + 1;
664 722
665 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 723 if (c >= N)
666 ++j;
667
668 if (w->at <= heap [j]->at)
669 break; 724 break;
670 725
726 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
727 ? 1 : 0;
728
729 if (w->at <= heap [c]->at)
730 break;
731
671 heap [k] = heap [j]; 732 heap [k] = heap [c];
672 ((W)heap [k])->active = k + 1; 733 ((W)heap [k])->active = k + 1;
734
673 k = j; 735 k = c;
674 } 736 }
675 737
676 heap [k] = w; 738 heap [k] = w;
677 ((W)heap [k])->active = k + 1; 739 ((W)heap [k])->active = k + 1;
678} 740}
… …
785 ev_unref (EV_A); /* child watcher should not keep loop alive */ 847 ev_unref (EV_A); /* child watcher should not keep loop alive */
786} 848}
787 849
788/*****************************************************************************/ 850/*****************************************************************************/
789 851
790static ev_child *childs [EV_PID_HASHSIZE]; 852static WL childs [EV_PID_HASHSIZE];
791 853
792#ifndef _WIN32 854#ifndef _WIN32
793 855
794static ev_signal childev; 856static ev_signal childev;
795 857
… …
910} 972}
911 973
912unsigned int 974unsigned int
913ev_embeddable_backends (void) 975ev_embeddable_backends (void)
914{ 976{
915 return EVBACKEND_EPOLL 977 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
916 | EVBACKEND_KQUEUE 978
917 | EVBACKEND_PORT; 979 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
980 /* please fix it and tell me how to detect the fix */
981 flags &= ~EVBACKEND_EPOLL;
982
983 return flags;
918} 984}
919 985
920unsigned int 986unsigned int
921ev_backend (EV_P) 987ev_backend (EV_P)
922{ 988{
… …
925 991
926unsigned int 992unsigned int
927ev_loop_count (EV_P) 993ev_loop_count (EV_P)
928{ 994{
929 return loop_count; 995 return loop_count;
996}
997
998void
999ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1000{
1001 io_blocktime = interval;
1002}
1003
1004void
1005ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1006{
1007 timeout_blocktime = interval;
930} 1008}
931 1009
932static void noinline 1010static void noinline
933loop_init (EV_P_ unsigned int flags) 1011loop_init (EV_P_ unsigned int flags)
934{ 1012{
… …
945 ev_rt_now = ev_time (); 1023 ev_rt_now = ev_time ();
946 mn_now = get_clock (); 1024 mn_now = get_clock ();
947 now_floor = mn_now; 1025 now_floor = mn_now;
948 rtmn_diff = ev_rt_now - mn_now; 1026 rtmn_diff = ev_rt_now - mn_now;
949 1027
1028 io_blocktime = 0.;
1029 timeout_blocktime = 0.;
1030
950 /* pid check not overridable via env */ 1031 /* pid check not overridable via env */
951#ifndef _WIN32 1032#ifndef _WIN32
952 if (flags & EVFLAG_FORKCHECK) 1033 if (flags & EVFLAG_FORKCHECK)
953 curpid = getpid (); 1034 curpid = getpid ();
954#endif 1035#endif
… …
1022 array_free (pending, [i]); 1103 array_free (pending, [i]);
1023#if EV_IDLE_ENABLE 1104#if EV_IDLE_ENABLE
1024 array_free (idle, [i]); 1105 array_free (idle, [i]);
1025#endif 1106#endif
1026 } 1107 }
1108
1109 ev_free (anfds); anfdmax = 0;
1027 1110
1028 /* have to use the microsoft-never-gets-it-right macro */ 1111 /* have to use the microsoft-never-gets-it-right macro */
1029 array_free (fdchange, EMPTY); 1112 array_free (fdchange, EMPTY);
1030 array_free (timer, EMPTY); 1113 array_free (timer, EMPTY);
1031#if EV_PERIODIC_ENABLE 1114#if EV_PERIODIC_ENABLE
1032 array_free (periodic, EMPTY); 1115 array_free (periodic, EMPTY);
1116#endif
1117#if EV_FORK_ENABLE
1118 array_free (fork, EMPTY);
1033#endif 1119#endif
1034 array_free (prepare, EMPTY); 1120 array_free (prepare, EMPTY);
1035 array_free (check, EMPTY); 1121 array_free (check, EMPTY);
1036 1122
1037 backend = 0; 1123 backend = 0;
… …
1207void inline_size 1293void inline_size
1208timers_reify (EV_P) 1294timers_reify (EV_P)
1209{ 1295{
1210 while (timercnt && ((WT)timers [0])->at <= mn_now) 1296 while (timercnt && ((WT)timers [0])->at <= mn_now)
1211 { 1297 {
1212 ev_timer *w = timers [0]; 1298 ev_timer *w = (ev_timer *)timers [0];
1213 1299
1214 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1300 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1215 1301
1216 /* first reschedule or stop timer */ 1302 /* first reschedule or stop timer */
1217 if (w->repeat) 1303 if (w->repeat)
… …
1220 1306
1221 ((WT)w)->at += w->repeat; 1307 ((WT)w)->at += w->repeat;
1222 if (((WT)w)->at < mn_now) 1308 if (((WT)w)->at < mn_now)
1223 ((WT)w)->at = mn_now; 1309 ((WT)w)->at = mn_now;
1224 1310
1225 downheap ((WT *)timers, timercnt, 0); 1311 downheap (timers, timercnt, 0);
1226 } 1312 }
1227 else 1313 else
1228 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1314 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1229 1315
1230 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1316 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1235void inline_size 1321void inline_size
1236periodics_reify (EV_P) 1322periodics_reify (EV_P)
1237{ 1323{
1238 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1324 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1239 { 1325 {
1240 ev_periodic *w = periodics [0]; 1326 ev_periodic *w = (ev_periodic *)periodics [0];
1241 1327
1242 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1328 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1243 1329
1244 /* first reschedule or stop timer */ 1330 /* first reschedule or stop timer */
1245 if (w->reschedule_cb) 1331 if (w->reschedule_cb)
1246 { 1332 {
1247 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1333 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1248 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1334 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1249 downheap ((WT *)periodics, periodiccnt, 0); 1335 downheap (periodics, periodiccnt, 0);
1250 } 1336 }
1251 else if (w->interval) 1337 else if (w->interval)
1252 { 1338 {
1253 ((WT)w)->at = w->offset + floor ((ev_rt_now + TIME_EPSILON - w->offset) / w->interval + 1.) * w->interval; 1339 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1340 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)); 1341 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); 1342 downheap (periodics, periodiccnt, 0);
1256 } 1343 }
1257 else 1344 else
1258 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1345 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1259 1346
1260 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1347 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1267 int i; 1354 int i;
1268 1355
1269 /* adjust periodics after time jump */ 1356 /* adjust periodics after time jump */
1270 for (i = 0; i < periodiccnt; ++i) 1357 for (i = 0; i < periodiccnt; ++i)
1271 { 1358 {
1272 ev_periodic *w = periodics [i]; 1359 ev_periodic *w = (ev_periodic *)periodics [i];
1273 1360
1274 if (w->reschedule_cb) 1361 if (w->reschedule_cb)
1275 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1362 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1276 else if (w->interval) 1363 else if (w->interval)
1277 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1364 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1278 } 1365 }
1279 1366
1280 /* now rebuild the heap */ 1367 /* now rebuild the heap */
1281 for (i = periodiccnt >> 1; i--; ) 1368 for (i = periodiccnt >> 1; i--; )
1282 downheap ((WT *)periodics, periodiccnt, i); 1369 downheap (periodics, periodiccnt, i);
1283} 1370}
1284#endif 1371#endif
1285 1372
1286#if EV_IDLE_ENABLE 1373#if EV_IDLE_ENABLE
1287void inline_size 1374void inline_size
… …
1304 } 1391 }
1305 } 1392 }
1306} 1393}
1307#endif 1394#endif
1308 1395
1309int inline_size 1396void inline_speed
1310time_update_monotonic (EV_P) 1397time_update (EV_P_ ev_tstamp max_block)
1311{ 1398{
1399 int i;
1400
1401#if EV_USE_MONOTONIC
1402 if (expect_true (have_monotonic))
1403 {
1404 ev_tstamp odiff = rtmn_diff;
1405
1312 mn_now = get_clock (); 1406 mn_now = get_clock ();
1313 1407
1408 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1409 /* interpolate in the meantime */
1314 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1410 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1315 { 1411 {
1316 ev_rt_now = rtmn_diff + mn_now; 1412 ev_rt_now = rtmn_diff + mn_now;
1317 return 0; 1413 return;
1318 } 1414 }
1319 else 1415
1320 {
1321 now_floor = mn_now; 1416 now_floor = mn_now;
1322 ev_rt_now = ev_time (); 1417 ev_rt_now = ev_time ();
1323 return 1;
1324 }
1325}
1326 1418
1327void inline_size 1419 /* loop a few times, before making important decisions.
1328time_update (EV_P) 1420 * on the choice of "4": one iteration isn't enough,
1329{ 1421 * in case we get preempted during the calls to
1330 int i; 1422 * ev_time and get_clock. a second call is almost guaranteed
1331 1423 * to succeed in that case, though. and looping a few more times
1332#if EV_USE_MONOTONIC 1424 * doesn't hurt either as we only do this on time-jumps or
1333 if (expect_true (have_monotonic)) 1425 * in the unlikely event of having been preempted here.
1334 { 1426 */
1335 if (time_update_monotonic (EV_A)) 1427 for (i = 4; --i; )
1336 { 1428 {
1337 ev_tstamp odiff = rtmn_diff;
1338
1339 /* loop a few times, before making important decisions.
1340 * on the choice of "4": one iteration isn't enough,
1341 * in case we get preempted during the calls to
1342 * ev_time and get_clock. a second call is almost guaranteed
1343 * to succeed in that case, though. and looping a few more times
1344 * doesn't hurt either as we only do this on time-jumps or
1345 * in the unlikely event of having been preempted here.
1346 */
1347 for (i = 4; --i; )
1348 {
1349 rtmn_diff = ev_rt_now - mn_now; 1429 rtmn_diff = ev_rt_now - mn_now;
1350 1430
1351 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1431 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1352 return; /* all is well */ 1432 return; /* all is well */
1353 1433
1354 ev_rt_now = ev_time (); 1434 ev_rt_now = ev_time ();
1355 mn_now = get_clock (); 1435 mn_now = get_clock ();
1356 now_floor = mn_now; 1436 now_floor = mn_now;
1357 } 1437 }
1358 1438
1359# if EV_PERIODIC_ENABLE 1439# if EV_PERIODIC_ENABLE
1360 periodics_reschedule (EV_A); 1440 periodics_reschedule (EV_A);
1361# endif 1441# endif
1362 /* no timer adjustment, as the monotonic clock doesn't jump */ 1442 /* no timer adjustment, as the monotonic clock doesn't jump */
1363 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1443 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1364 }
1365 } 1444 }
1366 else 1445 else
1367#endif 1446#endif
1368 { 1447 {
1369 ev_rt_now = ev_time (); 1448 ev_rt_now = ev_time ();
1370 1449
1371 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1450 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1372 { 1451 {
1373#if EV_PERIODIC_ENABLE 1452#if EV_PERIODIC_ENABLE
1374 periodics_reschedule (EV_A); 1453 periodics_reschedule (EV_A);
1375#endif 1454#endif
1376
1377 /* adjust timers. this is easy, as the offset is the same for all of them */ 1455 /* adjust timers. this is easy, as the offset is the same for all of them */
1378 for (i = 0; i < timercnt; ++i) 1456 for (i = 0; i < timercnt; ++i)
1379 ((WT)timers [i])->at += ev_rt_now - mn_now; 1457 ((WT)timers [i])->at += ev_rt_now - mn_now;
1380 } 1458 }
1381 1459
… …
1444 /* update fd-related kernel structures */ 1522 /* update fd-related kernel structures */
1445 fd_reify (EV_A); 1523 fd_reify (EV_A);
1446 1524
1447 /* calculate blocking time */ 1525 /* calculate blocking time */
1448 { 1526 {
1449 ev_tstamp block; 1527 ev_tstamp waittime = 0.;
1528 ev_tstamp sleeptime = 0.;
1450 1529
1451 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1530 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1452 block = 0.; /* do not block at all */
1453 else
1454 { 1531 {
1455 /* update time to cancel out callback processing overhead */ 1532 /* update time to cancel out callback processing overhead */
1456#if EV_USE_MONOTONIC
1457 if (expect_true (have_monotonic))
1458 time_update_monotonic (EV_A); 1533 time_update (EV_A_ 1e100);
1459 else
1460#endif
1461 {
1462 ev_rt_now = ev_time ();
1463 mn_now = ev_rt_now;
1464 }
1465 1534
1466 block = MAX_BLOCKTIME; 1535 waittime = MAX_BLOCKTIME;
1467 1536
1468 if (timercnt) 1537 if (timercnt)
1469 { 1538 {
1470 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1539 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1471 if (block > to) block = to; 1540 if (waittime > to) waittime = to;
1472 } 1541 }
1473 1542
1474#if EV_PERIODIC_ENABLE 1543#if EV_PERIODIC_ENABLE
1475 if (periodiccnt) 1544 if (periodiccnt)
1476 { 1545 {
1477 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1546 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1478 if (block > to) block = to; 1547 if (waittime > to) waittime = to;
1479 } 1548 }
1480#endif 1549#endif
1481 1550
1482 if (expect_false (block < 0.)) block = 0.; 1551 if (expect_false (waittime < timeout_blocktime))
1552 waittime = timeout_blocktime;
1553
1554 sleeptime = waittime - backend_fudge;
1555
1556 if (expect_true (sleeptime > io_blocktime))
1557 sleeptime = io_blocktime;
1558
1559 if (sleeptime)
1560 {
1561 ev_sleep (sleeptime);
1562 waittime -= sleeptime;
1563 }
1483 } 1564 }
1484 1565
1485 ++loop_count; 1566 ++loop_count;
1486 backend_poll (EV_A_ block); 1567 backend_poll (EV_A_ waittime);
1568
1569 /* update ev_rt_now, do magic */
1570 time_update (EV_A_ waittime + sleeptime);
1487 } 1571 }
1488
1489 /* update ev_rt_now, do magic */
1490 time_update (EV_A);
1491 1572
1492 /* queue pending timers and reschedule them */ 1573 /* queue pending timers and reschedule them */
1493 timers_reify (EV_A); /* relative timers called last */ 1574 timers_reify (EV_A); /* relative timers called last */
1494#if EV_PERIODIC_ENABLE 1575#if EV_PERIODIC_ENABLE
1495 periodics_reify (EV_A); /* absolute timers called first */ 1576 periodics_reify (EV_A); /* absolute timers called first */
… …
1606 1687
1607 assert (("ev_io_start called with negative fd", fd >= 0)); 1688 assert (("ev_io_start called with negative fd", fd >= 0));
1608 1689
1609 ev_start (EV_A_ (W)w, 1); 1690 ev_start (EV_A_ (W)w, 1);
1610 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1691 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1611 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1692 wlist_add (&anfds[fd].head, (WL)w);
1612 1693
1613 fd_change (EV_A_ fd); 1694 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1695 w->events &= ~EV_IOFDSET;
1614} 1696}
1615 1697
1616void noinline 1698void noinline
1617ev_io_stop (EV_P_ ev_io *w) 1699ev_io_stop (EV_P_ ev_io *w)
1618{ 1700{
… …
1620 if (expect_false (!ev_is_active (w))) 1702 if (expect_false (!ev_is_active (w)))
1621 return; 1703 return;
1622 1704
1623 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1705 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1624 1706
1625 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1707 wlist_del (&anfds[w->fd].head, (WL)w);
1626 ev_stop (EV_A_ (W)w); 1708 ev_stop (EV_A_ (W)w);
1627 1709
1628 fd_change (EV_A_ w->fd); 1710 fd_change (EV_A_ w->fd, 1);
1629} 1711}
1630 1712
1631void noinline 1713void noinline
1632ev_timer_start (EV_P_ ev_timer *w) 1714ev_timer_start (EV_P_ ev_timer *w)
1633{ 1715{
… …
1637 ((WT)w)->at += mn_now; 1719 ((WT)w)->at += mn_now;
1638 1720
1639 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1721 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1640 1722
1641 ev_start (EV_A_ (W)w, ++timercnt); 1723 ev_start (EV_A_ (W)w, ++timercnt);
1642 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1724 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1643 timers [timercnt - 1] = w; 1725 timers [timercnt - 1] = (WT)w;
1644 upheap ((WT *)timers, timercnt - 1); 1726 upheap (timers, timercnt - 1);
1645 1727
1646 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1728 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1647} 1729}
1648 1730
1649void noinline 1731void noinline
… …
1651{ 1733{
1652 clear_pending (EV_A_ (W)w); 1734 clear_pending (EV_A_ (W)w);
1653 if (expect_false (!ev_is_active (w))) 1735 if (expect_false (!ev_is_active (w)))
1654 return; 1736 return;
1655 1737
1656 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1738 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1657 1739
1658 { 1740 {
1659 int active = ((W)w)->active; 1741 int active = ((W)w)->active;
1660 1742
1661 if (expect_true (--active < --timercnt)) 1743 if (expect_true (--active < --timercnt))
1662 { 1744 {
1663 timers [active] = timers [timercnt]; 1745 timers [active] = timers [timercnt];
1664 adjustheap ((WT *)timers, timercnt, active); 1746 adjustheap (timers, timercnt, active);
1665 } 1747 }
1666 } 1748 }
1667 1749
1668 ((WT)w)->at -= mn_now; 1750 ((WT)w)->at -= mn_now;
1669 1751
… …
1676 if (ev_is_active (w)) 1758 if (ev_is_active (w))
1677 { 1759 {
1678 if (w->repeat) 1760 if (w->repeat)
1679 { 1761 {
1680 ((WT)w)->at = mn_now + w->repeat; 1762 ((WT)w)->at = mn_now + w->repeat;
1681 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1763 adjustheap (timers, timercnt, ((W)w)->active - 1);
1682 } 1764 }
1683 else 1765 else
1684 ev_timer_stop (EV_A_ w); 1766 ev_timer_stop (EV_A_ w);
1685 } 1767 }
1686 else if (w->repeat) 1768 else if (w->repeat)
… …
1707 } 1789 }
1708 else 1790 else
1709 ((WT)w)->at = w->offset; 1791 ((WT)w)->at = w->offset;
1710 1792
1711 ev_start (EV_A_ (W)w, ++periodiccnt); 1793 ev_start (EV_A_ (W)w, ++periodiccnt);
1712 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1794 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1713 periodics [periodiccnt - 1] = w; 1795 periodics [periodiccnt - 1] = (WT)w;
1714 upheap ((WT *)periodics, periodiccnt - 1); 1796 upheap (periodics, periodiccnt - 1);
1715 1797
1716 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1798 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1717} 1799}
1718 1800
1719void noinline 1801void noinline
… …
1721{ 1803{
1722 clear_pending (EV_A_ (W)w); 1804 clear_pending (EV_A_ (W)w);
1723 if (expect_false (!ev_is_active (w))) 1805 if (expect_false (!ev_is_active (w)))
1724 return; 1806 return;
1725 1807
1726 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1808 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1727 1809
1728 { 1810 {
1729 int active = ((W)w)->active; 1811 int active = ((W)w)->active;
1730 1812
1731 if (expect_true (--active < --periodiccnt)) 1813 if (expect_true (--active < --periodiccnt))
1732 { 1814 {
1733 periodics [active] = periodics [periodiccnt]; 1815 periodics [active] = periodics [periodiccnt];
1734 adjustheap ((WT *)periodics, periodiccnt, active); 1816 adjustheap (periodics, periodiccnt, active);
1735 } 1817 }
1736 } 1818 }
1737 1819
1738 ev_stop (EV_A_ (W)w); 1820 ev_stop (EV_A_ (W)w);
1739} 1821}
… …
1760 if (expect_false (ev_is_active (w))) 1842 if (expect_false (ev_is_active (w)))
1761 return; 1843 return;
1762 1844
1763 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1845 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1764 1846
1847 {
1848#ifndef _WIN32
1849 sigset_t full, prev;
1850 sigfillset (&full);
1851 sigprocmask (SIG_SETMASK, &full, &prev);
1852#endif
1853
1854 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1855
1856#ifndef _WIN32
1857 sigprocmask (SIG_SETMASK, &prev, 0);
1858#endif
1859 }
1860
1765 ev_start (EV_A_ (W)w, 1); 1861 ev_start (EV_A_ (W)w, 1);
1766 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1767 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1862 wlist_add (&signals [w->signum - 1].head, (WL)w);
1768 1863
1769 if (!((WL)w)->next) 1864 if (!((WL)w)->next)
1770 { 1865 {
1771#if _WIN32 1866#if _WIN32
1772 signal (w->signum, sighandler); 1867 signal (w->signum, sighandler);
… …
1785{ 1880{
1786 clear_pending (EV_A_ (W)w); 1881 clear_pending (EV_A_ (W)w);
1787 if (expect_false (!ev_is_active (w))) 1882 if (expect_false (!ev_is_active (w)))
1788 return; 1883 return;
1789 1884
1790 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1885 wlist_del (&signals [w->signum - 1].head, (WL)w);
1791 ev_stop (EV_A_ (W)w); 1886 ev_stop (EV_A_ (W)w);
1792 1887
1793 if (!signals [w->signum - 1].head) 1888 if (!signals [w->signum - 1].head)
1794 signal (w->signum, SIG_DFL); 1889 signal (w->signum, SIG_DFL);
1795} 1890}
… …
1802#endif 1897#endif
1803 if (expect_false (ev_is_active (w))) 1898 if (expect_false (ev_is_active (w)))
1804 return; 1899 return;
1805 1900
1806 ev_start (EV_A_ (W)w, 1); 1901 ev_start (EV_A_ (W)w, 1);
1807 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1902 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1808} 1903}
1809 1904
1810void 1905void
1811ev_child_stop (EV_P_ ev_child *w) 1906ev_child_stop (EV_P_ ev_child *w)
1812{ 1907{
1813 clear_pending (EV_A_ (W)w); 1908 clear_pending (EV_A_ (W)w);
1814 if (expect_false (!ev_is_active (w))) 1909 if (expect_false (!ev_is_active (w)))
1815 return; 1910 return;
1816 1911
1817 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1912 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1818 ev_stop (EV_A_ (W)w); 1913 ev_stop (EV_A_ (W)w);
1819} 1914}
1820 1915
1821#if EV_STAT_ENABLE 1916#if EV_STAT_ENABLE
1822 1917
… …
2164 2259
2165#if EV_EMBED_ENABLE 2260#if EV_EMBED_ENABLE
2166void noinline 2261void noinline
2167ev_embed_sweep (EV_P_ ev_embed *w) 2262ev_embed_sweep (EV_P_ ev_embed *w)
2168{ 2263{
2169 ev_loop (w->loop, EVLOOP_NONBLOCK); 2264 ev_loop (w->other, EVLOOP_NONBLOCK);
2170} 2265}
2171 2266
2172static void 2267static void
2173embed_cb (EV_P_ ev_io *io, int revents) 2268embed_io_cb (EV_P_ ev_io *io, int revents)
2174{ 2269{
2175 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2270 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2176 2271
2177 if (ev_cb (w)) 2272 if (ev_cb (w))
2178 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2273 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2179 else 2274 else
2180 ev_embed_sweep (loop, w); 2275 ev_loop (w->other, EVLOOP_NONBLOCK);
2181} 2276}
2277
2278static void
2279embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2280{
2281 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2282
2283 {
2284 struct ev_loop *loop = w->other;
2285
2286 while (fdchangecnt)
2287 {
2288 fd_reify (EV_A);
2289 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2290 }
2291 }
2292}
2293
2294#if 0
2295static void
2296embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2297{
2298 ev_idle_stop (EV_A_ idle);
2299}
2300#endif
2182 2301
2183void 2302void
2184ev_embed_start (EV_P_ ev_embed *w) 2303ev_embed_start (EV_P_ ev_embed *w)
2185{ 2304{
2186 if (expect_false (ev_is_active (w))) 2305 if (expect_false (ev_is_active (w)))
2187 return; 2306 return;
2188 2307
2189 { 2308 {
2190 struct ev_loop *loop = w->loop; 2309 struct ev_loop *loop = w->other;
2191 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2310 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2192 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2311 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2193 } 2312 }
2194 2313
2195 ev_set_priority (&w->io, ev_priority (w)); 2314 ev_set_priority (&w->io, ev_priority (w));
2196 ev_io_start (EV_A_ &w->io); 2315 ev_io_start (EV_A_ &w->io);
2197 2316
2317 ev_prepare_init (&w->prepare, embed_prepare_cb);
2318 ev_set_priority (&w->prepare, EV_MINPRI);
2319 ev_prepare_start (EV_A_ &w->prepare);
2320
2321 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2322
2198 ev_start (EV_A_ (W)w, 1); 2323 ev_start (EV_A_ (W)w, 1);
2199} 2324}
2200 2325
2201void 2326void
2202ev_embed_stop (EV_P_ ev_embed *w) 2327ev_embed_stop (EV_P_ ev_embed *w)
… …
2204 clear_pending (EV_A_ (W)w); 2329 clear_pending (EV_A_ (W)w);
2205 if (expect_false (!ev_is_active (w))) 2330 if (expect_false (!ev_is_active (w)))
2206 return; 2331 return;
2207 2332
2208 ev_io_stop (EV_A_ &w->io); 2333 ev_io_stop (EV_A_ &w->io);
2334 ev_prepare_stop (EV_A_ &w->prepare);
2209 2335
2210 ev_stop (EV_A_ (W)w); 2336 ev_stop (EV_A_ (W)w);
2211} 2337}
2212#endif 2338#endif
2213 2339
… …
2302 ev_timer_set (&once->to, timeout, 0.); 2428 ev_timer_set (&once->to, timeout, 0.);
2303 ev_timer_start (EV_A_ &once->to); 2429 ev_timer_start (EV_A_ &once->to);
2304 } 2430 }
2305} 2431}
2306 2432
2433#if EV_MULTIPLICITY
2434 #include "ev_wrap.h"
2435#endif
2436
2307#ifdef __cplusplus 2437#ifdef __cplusplus
2308} 2438}
2309#endif 2439#endif
2310 2440

Diff Legend

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