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

Comparing libev/ev.c (file contents):
Revision 1.172 by root, Sun Dec 9 02:27:44 2007 UTC vs.
Revision 1.196 by root, Sat Dec 22 12:43:28 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 236#endif
210 237
211#if !EV_STAT_ENABLE
212# define EV_USE_INOTIFY 0
213#endif
214
215#if EV_USE_INOTIFY
216# include <sys/inotify.h>
217#endif
218
219/**/ 238/**/
239
240/*
241 * This is used to avoid floating point rounding problems.
242 * It is added to ev_rt_now when scheduling periodics
243 * to ensure progress, time-wise, even when rounding
244 * errors are against us.
245 * This value is good at least till the year 4000.
246 * Better solutions welcome.
247 */
248#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
220 249
221#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) */
222#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) */
223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 252/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
224 253
225#if __GNUC__ >= 3 254#if __GNUC__ >= 4
226# define expect(expr,value) __builtin_expect ((expr),(value)) 255# define expect(expr,value) __builtin_expect ((expr),(value))
227# define noinline __attribute__ ((noinline)) 256# define noinline __attribute__ ((noinline))
228#else 257#else
229# define expect(expr,value) (expr) 258# define expect(expr,value) (expr)
230# define noinline 259# define noinline
… …
251 280
252typedef ev_watcher *W; 281typedef ev_watcher *W;
253typedef ev_watcher_list *WL; 282typedef ev_watcher_list *WL;
254typedef ev_watcher_time *WT; 283typedef ev_watcher_time *WT;
255 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 */
256static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 287static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
257 288
258#ifdef _WIN32 289#ifdef _WIN32
259# include "ev_win32.c" 290# include "ev_win32.c"
260#endif 291#endif
261 292
… …
397{ 428{
398 return ev_rt_now; 429 return ev_rt_now;
399} 430}
400#endif 431#endif
401 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
402int inline_size 460int inline_size
403array_nextsize (int elem, int cur, int cnt) 461array_nextsize (int elem, int cur, int cnt)
404{ 462{
405 int ncur = cur + 1; 463 int ncur = cur + 1;
406 464
… …
466 pendings [pri][w_->pending - 1].w = w_; 524 pendings [pri][w_->pending - 1].w = w_;
467 pendings [pri][w_->pending - 1].events = revents; 525 pendings [pri][w_->pending - 1].events = revents;
468 } 526 }
469} 527}
470 528
471void inline_size 529void inline_speed
472queue_events (EV_P_ W *events, int eventcnt, int type) 530queue_events (EV_P_ W *events, int eventcnt, int type)
473{ 531{
474 int i; 532 int i;
475 533
476 for (i = 0; i < eventcnt; ++i) 534 for (i = 0; i < eventcnt; ++i)
… …
523 { 581 {
524 int fd = fdchanges [i]; 582 int fd = fdchanges [i];
525 ANFD *anfd = anfds + fd; 583 ANFD *anfd = anfds + fd;
526 ev_io *w; 584 ev_io *w;
527 585
528 int events = 0; 586 unsigned char events = 0;
529 587
530 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)
531 events |= w->events; 589 events |= (unsigned char)w->events;
532 590
533#if EV_SELECT_IS_WINSOCKET 591#if EV_SELECT_IS_WINSOCKET
534 if (events) 592 if (events)
535 { 593 {
536 unsigned long argp; 594 unsigned long argp;
537 anfd->handle = _get_osfhandle (fd); 595 anfd->handle = _get_osfhandle (fd);
538 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));
539 } 597 }
540#endif 598#endif
541 599
600 {
601 unsigned char o_events = anfd->events;
602 unsigned char o_reify = anfd->reify;
603
542 anfd->reify = 0; 604 anfd->reify = 0;
543
544 backend_modify (EV_A_ fd, anfd->events, events);
545 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 }
546 } 610 }
547 611
548 fdchangecnt = 0; 612 fdchangecnt = 0;
549} 613}
550 614
551void inline_size 615void inline_size
552fd_change (EV_P_ int fd) 616fd_change (EV_P_ int fd, int flags)
553{ 617{
554 if (expect_false (anfds [fd].reify)) 618 unsigned char reify = anfds [fd].reify;
555 return;
556
557 anfds [fd].reify = 1; 619 anfds [fd].reify |= flags;
558 620
621 if (expect_true (!reify))
622 {
559 ++fdchangecnt; 623 ++fdchangecnt;
560 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 624 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
561 fdchanges [fdchangecnt - 1] = fd; 625 fdchanges [fdchangecnt - 1] = fd;
626 }
562} 627}
563 628
564void inline_speed 629void inline_speed
565fd_kill (EV_P_ int fd) 630fd_kill (EV_P_ int fd)
566{ 631{
… …
617 682
618 for (fd = 0; fd < anfdmax; ++fd) 683 for (fd = 0; fd < anfdmax; ++fd)
619 if (anfds [fd].events) 684 if (anfds [fd].events)
620 { 685 {
621 anfds [fd].events = 0; 686 anfds [fd].events = 0;
622 fd_change (EV_A_ fd); 687 fd_change (EV_A_ fd, EV_IOFDSET | 1);
623 } 688 }
624} 689}
625 690
626/*****************************************************************************/ 691/*****************************************************************************/
627 692
628void inline_speed 693void inline_speed
629upheap (WT *heap, int k) 694upheap (WT *heap, int k)
630{ 695{
631 WT w = heap [k]; 696 WT w = heap [k];
632 697
633 while (k && heap [k >> 1]->at > w->at) 698 while (k)
634 { 699 {
700 int p = (k - 1) >> 1;
701
702 if (heap [p]->at <= w->at)
703 break;
704
635 heap [k] = heap [k >> 1]; 705 heap [k] = heap [p];
636 ((W)heap [k])->active = k + 1; 706 ((W)heap [k])->active = k + 1;
637 k >>= 1; 707 k = p;
638 } 708 }
639 709
640 heap [k] = w; 710 heap [k] = w;
641 ((W)heap [k])->active = k + 1; 711 ((W)heap [k])->active = k + 1;
642
643} 712}
644 713
645void inline_speed 714void inline_speed
646downheap (WT *heap, int N, int k) 715downheap (WT *heap, int N, int k)
647{ 716{
648 WT w = heap [k]; 717 WT w = heap [k];
649 718
650 while (k < (N >> 1)) 719 for (;;)
651 { 720 {
652 int j = k << 1; 721 int c = (k << 1) + 1;
653 722
654 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 723 if (c >= N)
655 ++j;
656
657 if (w->at <= heap [j]->at)
658 break; 724 break;
659 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
660 heap [k] = heap [j]; 732 heap [k] = heap [c];
661 ((W)heap [k])->active = k + 1; 733 ((W)heap [k])->active = k + 1;
734
662 k = j; 735 k = c;
663 } 736 }
664 737
665 heap [k] = w; 738 heap [k] = w;
666 ((W)heap [k])->active = k + 1; 739 ((W)heap [k])->active = k + 1;
667} 740}
… …
774 ev_unref (EV_A); /* child watcher should not keep loop alive */ 847 ev_unref (EV_A); /* child watcher should not keep loop alive */
775} 848}
776 849
777/*****************************************************************************/ 850/*****************************************************************************/
778 851
779static ev_child *childs [EV_PID_HASHSIZE]; 852static WL childs [EV_PID_HASHSIZE];
780 853
781#ifndef _WIN32 854#ifndef _WIN32
782 855
783static ev_signal childev; 856static ev_signal childev;
784 857
… …
899} 972}
900 973
901unsigned int 974unsigned int
902ev_embeddable_backends (void) 975ev_embeddable_backends (void)
903{ 976{
904 return EVBACKEND_EPOLL 977 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
905 | EVBACKEND_KQUEUE 978
906 | 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#ifdef __APPLE__
984 /* is there anything thats not broken on darwin? */
985 flags &= ~EVBACKEND_KQUEUE;
986#endif
987
988 return flags;
907} 989}
908 990
909unsigned int 991unsigned int
910ev_backend (EV_P) 992ev_backend (EV_P)
911{ 993{
… …
914 996
915unsigned int 997unsigned int
916ev_loop_count (EV_P) 998ev_loop_count (EV_P)
917{ 999{
918 return loop_count; 1000 return loop_count;
1001}
1002
1003void
1004ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1005{
1006 io_blocktime = interval;
1007}
1008
1009void
1010ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1011{
1012 timeout_blocktime = interval;
919} 1013}
920 1014
921static void noinline 1015static void noinline
922loop_init (EV_P_ unsigned int flags) 1016loop_init (EV_P_ unsigned int flags)
923{ 1017{
… …
934 ev_rt_now = ev_time (); 1028 ev_rt_now = ev_time ();
935 mn_now = get_clock (); 1029 mn_now = get_clock ();
936 now_floor = mn_now; 1030 now_floor = mn_now;
937 rtmn_diff = ev_rt_now - mn_now; 1031 rtmn_diff = ev_rt_now - mn_now;
938 1032
1033 io_blocktime = 0.;
1034 timeout_blocktime = 0.;
1035
939 /* pid check not overridable via env */ 1036 /* pid check not overridable via env */
940#ifndef _WIN32 1037#ifndef _WIN32
941 if (flags & EVFLAG_FORKCHECK) 1038 if (flags & EVFLAG_FORKCHECK)
942 curpid = getpid (); 1039 curpid = getpid ();
943#endif 1040#endif
… …
1011 array_free (pending, [i]); 1108 array_free (pending, [i]);
1012#if EV_IDLE_ENABLE 1109#if EV_IDLE_ENABLE
1013 array_free (idle, [i]); 1110 array_free (idle, [i]);
1014#endif 1111#endif
1015 } 1112 }
1113
1114 ev_free (anfds); anfdmax = 0;
1016 1115
1017 /* have to use the microsoft-never-gets-it-right macro */ 1116 /* have to use the microsoft-never-gets-it-right macro */
1018 array_free (fdchange, EMPTY); 1117 array_free (fdchange, EMPTY);
1019 array_free (timer, EMPTY); 1118 array_free (timer, EMPTY);
1020#if EV_PERIODIC_ENABLE 1119#if EV_PERIODIC_ENABLE
1021 array_free (periodic, EMPTY); 1120 array_free (periodic, EMPTY);
1121#endif
1122#if EV_FORK_ENABLE
1123 array_free (fork, EMPTY);
1022#endif 1124#endif
1023 array_free (prepare, EMPTY); 1125 array_free (prepare, EMPTY);
1024 array_free (check, EMPTY); 1126 array_free (check, EMPTY);
1025 1127
1026 backend = 0; 1128 backend = 0;
… …
1196void inline_size 1298void inline_size
1197timers_reify (EV_P) 1299timers_reify (EV_P)
1198{ 1300{
1199 while (timercnt && ((WT)timers [0])->at <= mn_now) 1301 while (timercnt && ((WT)timers [0])->at <= mn_now)
1200 { 1302 {
1201 ev_timer *w = timers [0]; 1303 ev_timer *w = (ev_timer *)timers [0];
1202 1304
1203 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1305 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1204 1306
1205 /* first reschedule or stop timer */ 1307 /* first reschedule or stop timer */
1206 if (w->repeat) 1308 if (w->repeat)
… …
1209 1311
1210 ((WT)w)->at += w->repeat; 1312 ((WT)w)->at += w->repeat;
1211 if (((WT)w)->at < mn_now) 1313 if (((WT)w)->at < mn_now)
1212 ((WT)w)->at = mn_now; 1314 ((WT)w)->at = mn_now;
1213 1315
1214 downheap ((WT *)timers, timercnt, 0); 1316 downheap (timers, timercnt, 0);
1215 } 1317 }
1216 else 1318 else
1217 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1319 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1218 1320
1219 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1321 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1224void inline_size 1326void inline_size
1225periodics_reify (EV_P) 1327periodics_reify (EV_P)
1226{ 1328{
1227 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1329 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1228 { 1330 {
1229 ev_periodic *w = periodics [0]; 1331 ev_periodic *w = (ev_periodic *)periodics [0];
1230 1332
1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1333 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1232 1334
1233 /* first reschedule or stop timer */ 1335 /* first reschedule or stop timer */
1234 if (w->reschedule_cb) 1336 if (w->reschedule_cb)
1235 { 1337 {
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1338 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1237 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1339 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1238 downheap ((WT *)periodics, periodiccnt, 0); 1340 downheap (periodics, periodiccnt, 0);
1239 } 1341 }
1240 else if (w->interval) 1342 else if (w->interval)
1241 { 1343 {
1242 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1344 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1345 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1243 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1346 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1244 downheap ((WT *)periodics, periodiccnt, 0); 1347 downheap (periodics, periodiccnt, 0);
1245 } 1348 }
1246 else 1349 else
1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1350 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1248 1351
1249 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1352 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1256 int i; 1359 int i;
1257 1360
1258 /* adjust periodics after time jump */ 1361 /* adjust periodics after time jump */
1259 for (i = 0; i < periodiccnt; ++i) 1362 for (i = 0; i < periodiccnt; ++i)
1260 { 1363 {
1261 ev_periodic *w = periodics [i]; 1364 ev_periodic *w = (ev_periodic *)periodics [i];
1262 1365
1263 if (w->reschedule_cb) 1366 if (w->reschedule_cb)
1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1367 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1265 else if (w->interval) 1368 else if (w->interval)
1266 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1369 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1267 } 1370 }
1268 1371
1269 /* now rebuild the heap */ 1372 /* now rebuild the heap */
1270 for (i = periodiccnt >> 1; i--; ) 1373 for (i = periodiccnt >> 1; i--; )
1271 downheap ((WT *)periodics, periodiccnt, i); 1374 downheap (periodics, periodiccnt, i);
1272} 1375}
1273#endif 1376#endif
1274 1377
1275#if EV_IDLE_ENABLE 1378#if EV_IDLE_ENABLE
1276void inline_size 1379void inline_size
… …
1293 } 1396 }
1294 } 1397 }
1295} 1398}
1296#endif 1399#endif
1297 1400
1298int inline_size 1401void inline_speed
1299time_update_monotonic (EV_P) 1402time_update (EV_P_ ev_tstamp max_block)
1300{ 1403{
1404 int i;
1405
1406#if EV_USE_MONOTONIC
1407 if (expect_true (have_monotonic))
1408 {
1409 ev_tstamp odiff = rtmn_diff;
1410
1301 mn_now = get_clock (); 1411 mn_now = get_clock ();
1302 1412
1413 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1414 /* interpolate in the meantime */
1303 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1415 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1304 { 1416 {
1305 ev_rt_now = rtmn_diff + mn_now; 1417 ev_rt_now = rtmn_diff + mn_now;
1306 return 0; 1418 return;
1307 } 1419 }
1308 else 1420
1309 {
1310 now_floor = mn_now; 1421 now_floor = mn_now;
1311 ev_rt_now = ev_time (); 1422 ev_rt_now = ev_time ();
1312 return 1;
1313 }
1314}
1315 1423
1316void inline_size 1424 /* loop a few times, before making important decisions.
1317time_update (EV_P) 1425 * on the choice of "4": one iteration isn't enough,
1318{ 1426 * in case we get preempted during the calls to
1319 int i; 1427 * ev_time and get_clock. a second call is almost guaranteed
1320 1428 * to succeed in that case, though. and looping a few more times
1321#if EV_USE_MONOTONIC 1429 * doesn't hurt either as we only do this on time-jumps or
1322 if (expect_true (have_monotonic)) 1430 * in the unlikely event of having been preempted here.
1323 { 1431 */
1324 if (time_update_monotonic (EV_A)) 1432 for (i = 4; --i; )
1325 { 1433 {
1326 ev_tstamp odiff = rtmn_diff;
1327
1328 /* loop a few times, before making important decisions.
1329 * on the choice of "4": one iteration isn't enough,
1330 * in case we get preempted during the calls to
1331 * ev_time and get_clock. a second call is almost guaranteed
1332 * to succeed in that case, though. and looping a few more times
1333 * doesn't hurt either as we only do this on time-jumps or
1334 * in the unlikely event of having been preempted here.
1335 */
1336 for (i = 4; --i; )
1337 {
1338 rtmn_diff = ev_rt_now - mn_now; 1434 rtmn_diff = ev_rt_now - mn_now;
1339 1435
1340 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1436 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1341 return; /* all is well */ 1437 return; /* all is well */
1342 1438
1343 ev_rt_now = ev_time (); 1439 ev_rt_now = ev_time ();
1344 mn_now = get_clock (); 1440 mn_now = get_clock ();
1345 now_floor = mn_now; 1441 now_floor = mn_now;
1346 } 1442 }
1347 1443
1348# if EV_PERIODIC_ENABLE 1444# if EV_PERIODIC_ENABLE
1349 periodics_reschedule (EV_A); 1445 periodics_reschedule (EV_A);
1350# endif 1446# endif
1351 /* no timer adjustment, as the monotonic clock doesn't jump */ 1447 /* no timer adjustment, as the monotonic clock doesn't jump */
1352 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1448 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1353 }
1354 } 1449 }
1355 else 1450 else
1356#endif 1451#endif
1357 { 1452 {
1358 ev_rt_now = ev_time (); 1453 ev_rt_now = ev_time ();
1359 1454
1360 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1455 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1361 { 1456 {
1362#if EV_PERIODIC_ENABLE 1457#if EV_PERIODIC_ENABLE
1363 periodics_reschedule (EV_A); 1458 periodics_reschedule (EV_A);
1364#endif 1459#endif
1365
1366 /* adjust timers. this is easy, as the offset is the same for all of them */ 1460 /* adjust timers. this is easy, as the offset is the same for all of them */
1367 for (i = 0; i < timercnt; ++i) 1461 for (i = 0; i < timercnt; ++i)
1368 ((WT)timers [i])->at += ev_rt_now - mn_now; 1462 ((WT)timers [i])->at += ev_rt_now - mn_now;
1369 } 1463 }
1370 1464
… …
1433 /* update fd-related kernel structures */ 1527 /* update fd-related kernel structures */
1434 fd_reify (EV_A); 1528 fd_reify (EV_A);
1435 1529
1436 /* calculate blocking time */ 1530 /* calculate blocking time */
1437 { 1531 {
1438 ev_tstamp block; 1532 ev_tstamp waittime = 0.;
1533 ev_tstamp sleeptime = 0.;
1439 1534
1440 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1535 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1441 block = 0.; /* do not block at all */
1442 else
1443 { 1536 {
1444 /* update time to cancel out callback processing overhead */ 1537 /* update time to cancel out callback processing overhead */
1445#if EV_USE_MONOTONIC
1446 if (expect_true (have_monotonic))
1447 time_update_monotonic (EV_A); 1538 time_update (EV_A_ 1e100);
1448 else
1449#endif
1450 {
1451 ev_rt_now = ev_time ();
1452 mn_now = ev_rt_now;
1453 }
1454 1539
1455 block = MAX_BLOCKTIME; 1540 waittime = MAX_BLOCKTIME;
1456 1541
1457 if (timercnt) 1542 if (timercnt)
1458 { 1543 {
1459 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1544 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1460 if (block > to) block = to; 1545 if (waittime > to) waittime = to;
1461 } 1546 }
1462 1547
1463#if EV_PERIODIC_ENABLE 1548#if EV_PERIODIC_ENABLE
1464 if (periodiccnt) 1549 if (periodiccnt)
1465 { 1550 {
1466 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1551 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1467 if (block > to) block = to; 1552 if (waittime > to) waittime = to;
1468 } 1553 }
1469#endif 1554#endif
1470 1555
1471 if (expect_false (block < 0.)) block = 0.; 1556 if (expect_false (waittime < timeout_blocktime))
1557 waittime = timeout_blocktime;
1558
1559 sleeptime = waittime - backend_fudge;
1560
1561 if (expect_true (sleeptime > io_blocktime))
1562 sleeptime = io_blocktime;
1563
1564 if (sleeptime)
1565 {
1566 ev_sleep (sleeptime);
1567 waittime -= sleeptime;
1568 }
1472 } 1569 }
1473 1570
1474 ++loop_count; 1571 ++loop_count;
1475 backend_poll (EV_A_ block); 1572 backend_poll (EV_A_ waittime);
1573
1574 /* update ev_rt_now, do magic */
1575 time_update (EV_A_ waittime + sleeptime);
1476 } 1576 }
1477
1478 /* update ev_rt_now, do magic */
1479 time_update (EV_A);
1480 1577
1481 /* queue pending timers and reschedule them */ 1578 /* queue pending timers and reschedule them */
1482 timers_reify (EV_A); /* relative timers called last */ 1579 timers_reify (EV_A); /* relative timers called last */
1483#if EV_PERIODIC_ENABLE 1580#if EV_PERIODIC_ENABLE
1484 periodics_reify (EV_A); /* absolute timers called first */ 1581 periodics_reify (EV_A); /* absolute timers called first */
… …
1595 1692
1596 assert (("ev_io_start called with negative fd", fd >= 0)); 1693 assert (("ev_io_start called with negative fd", fd >= 0));
1597 1694
1598 ev_start (EV_A_ (W)w, 1); 1695 ev_start (EV_A_ (W)w, 1);
1599 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1696 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1600 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1697 wlist_add (&anfds[fd].head, (WL)w);
1601 1698
1602 fd_change (EV_A_ fd); 1699 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1700 w->events &= ~EV_IOFDSET;
1603} 1701}
1604 1702
1605void noinline 1703void noinline
1606ev_io_stop (EV_P_ ev_io *w) 1704ev_io_stop (EV_P_ ev_io *w)
1607{ 1705{
… …
1609 if (expect_false (!ev_is_active (w))) 1707 if (expect_false (!ev_is_active (w)))
1610 return; 1708 return;
1611 1709
1612 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1710 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1613 1711
1614 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1712 wlist_del (&anfds[w->fd].head, (WL)w);
1615 ev_stop (EV_A_ (W)w); 1713 ev_stop (EV_A_ (W)w);
1616 1714
1617 fd_change (EV_A_ w->fd); 1715 fd_change (EV_A_ w->fd, 1);
1618} 1716}
1619 1717
1620void noinline 1718void noinline
1621ev_timer_start (EV_P_ ev_timer *w) 1719ev_timer_start (EV_P_ ev_timer *w)
1622{ 1720{
… …
1626 ((WT)w)->at += mn_now; 1724 ((WT)w)->at += mn_now;
1627 1725
1628 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1726 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1629 1727
1630 ev_start (EV_A_ (W)w, ++timercnt); 1728 ev_start (EV_A_ (W)w, ++timercnt);
1631 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1729 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1632 timers [timercnt - 1] = w; 1730 timers [timercnt - 1] = (WT)w;
1633 upheap ((WT *)timers, timercnt - 1); 1731 upheap (timers, timercnt - 1);
1634 1732
1635 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1733 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1636} 1734}
1637 1735
1638void noinline 1736void noinline
… …
1640{ 1738{
1641 clear_pending (EV_A_ (W)w); 1739 clear_pending (EV_A_ (W)w);
1642 if (expect_false (!ev_is_active (w))) 1740 if (expect_false (!ev_is_active (w)))
1643 return; 1741 return;
1644 1742
1645 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1743 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1646 1744
1647 { 1745 {
1648 int active = ((W)w)->active; 1746 int active = ((W)w)->active;
1649 1747
1650 if (expect_true (--active < --timercnt)) 1748 if (expect_true (--active < --timercnt))
1651 { 1749 {
1652 timers [active] = timers [timercnt]; 1750 timers [active] = timers [timercnt];
1653 adjustheap ((WT *)timers, timercnt, active); 1751 adjustheap (timers, timercnt, active);
1654 } 1752 }
1655 } 1753 }
1656 1754
1657 ((WT)w)->at -= mn_now; 1755 ((WT)w)->at -= mn_now;
1658 1756
… …
1665 if (ev_is_active (w)) 1763 if (ev_is_active (w))
1666 { 1764 {
1667 if (w->repeat) 1765 if (w->repeat)
1668 { 1766 {
1669 ((WT)w)->at = mn_now + w->repeat; 1767 ((WT)w)->at = mn_now + w->repeat;
1670 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1768 adjustheap (timers, timercnt, ((W)w)->active - 1);
1671 } 1769 }
1672 else 1770 else
1673 ev_timer_stop (EV_A_ w); 1771 ev_timer_stop (EV_A_ w);
1674 } 1772 }
1675 else if (w->repeat) 1773 else if (w->repeat)
… …
1690 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1788 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1691 else if (w->interval) 1789 else if (w->interval)
1692 { 1790 {
1693 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1791 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1694 /* this formula differs from the one in periodic_reify because we do not always round up */ 1792 /* this formula differs from the one in periodic_reify because we do not always round up */
1695 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1793 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1696 } 1794 }
1795 else
1796 ((WT)w)->at = w->offset;
1697 1797
1698 ev_start (EV_A_ (W)w, ++periodiccnt); 1798 ev_start (EV_A_ (W)w, ++periodiccnt);
1699 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1799 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1700 periodics [periodiccnt - 1] = w; 1800 periodics [periodiccnt - 1] = (WT)w;
1701 upheap ((WT *)periodics, periodiccnt - 1); 1801 upheap (periodics, periodiccnt - 1);
1702 1802
1703 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1803 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1704} 1804}
1705 1805
1706void noinline 1806void noinline
… …
1708{ 1808{
1709 clear_pending (EV_A_ (W)w); 1809 clear_pending (EV_A_ (W)w);
1710 if (expect_false (!ev_is_active (w))) 1810 if (expect_false (!ev_is_active (w)))
1711 return; 1811 return;
1712 1812
1713 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1813 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1714 1814
1715 { 1815 {
1716 int active = ((W)w)->active; 1816 int active = ((W)w)->active;
1717 1817
1718 if (expect_true (--active < --periodiccnt)) 1818 if (expect_true (--active < --periodiccnt))
1719 { 1819 {
1720 periodics [active] = periodics [periodiccnt]; 1820 periodics [active] = periodics [periodiccnt];
1721 adjustheap ((WT *)periodics, periodiccnt, active); 1821 adjustheap (periodics, periodiccnt, active);
1722 } 1822 }
1723 } 1823 }
1724 1824
1725 ev_stop (EV_A_ (W)w); 1825 ev_stop (EV_A_ (W)w);
1726} 1826}
… …
1747 if (expect_false (ev_is_active (w))) 1847 if (expect_false (ev_is_active (w)))
1748 return; 1848 return;
1749 1849
1750 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1850 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1751 1851
1852 {
1853#ifndef _WIN32
1854 sigset_t full, prev;
1855 sigfillset (&full);
1856 sigprocmask (SIG_SETMASK, &full, &prev);
1857#endif
1858
1859 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1860
1861#ifndef _WIN32
1862 sigprocmask (SIG_SETMASK, &prev, 0);
1863#endif
1864 }
1865
1752 ev_start (EV_A_ (W)w, 1); 1866 ev_start (EV_A_ (W)w, 1);
1753 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1754 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1867 wlist_add (&signals [w->signum - 1].head, (WL)w);
1755 1868
1756 if (!((WL)w)->next) 1869 if (!((WL)w)->next)
1757 { 1870 {
1758#if _WIN32 1871#if _WIN32
1759 signal (w->signum, sighandler); 1872 signal (w->signum, sighandler);
… …
1772{ 1885{
1773 clear_pending (EV_A_ (W)w); 1886 clear_pending (EV_A_ (W)w);
1774 if (expect_false (!ev_is_active (w))) 1887 if (expect_false (!ev_is_active (w)))
1775 return; 1888 return;
1776 1889
1777 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1890 wlist_del (&signals [w->signum - 1].head, (WL)w);
1778 ev_stop (EV_A_ (W)w); 1891 ev_stop (EV_A_ (W)w);
1779 1892
1780 if (!signals [w->signum - 1].head) 1893 if (!signals [w->signum - 1].head)
1781 signal (w->signum, SIG_DFL); 1894 signal (w->signum, SIG_DFL);
1782} 1895}
… …
1789#endif 1902#endif
1790 if (expect_false (ev_is_active (w))) 1903 if (expect_false (ev_is_active (w)))
1791 return; 1904 return;
1792 1905
1793 ev_start (EV_A_ (W)w, 1); 1906 ev_start (EV_A_ (W)w, 1);
1794 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1907 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1795} 1908}
1796 1909
1797void 1910void
1798ev_child_stop (EV_P_ ev_child *w) 1911ev_child_stop (EV_P_ ev_child *w)
1799{ 1912{
1800 clear_pending (EV_A_ (W)w); 1913 clear_pending (EV_A_ (W)w);
1801 if (expect_false (!ev_is_active (w))) 1914 if (expect_false (!ev_is_active (w)))
1802 return; 1915 return;
1803 1916
1804 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1917 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1805 ev_stop (EV_A_ (W)w); 1918 ev_stop (EV_A_ (W)w);
1806} 1919}
1807 1920
1808#if EV_STAT_ENABLE 1921#if EV_STAT_ENABLE
1809 1922
… …
2151 2264
2152#if EV_EMBED_ENABLE 2265#if EV_EMBED_ENABLE
2153void noinline 2266void noinline
2154ev_embed_sweep (EV_P_ ev_embed *w) 2267ev_embed_sweep (EV_P_ ev_embed *w)
2155{ 2268{
2156 ev_loop (w->loop, EVLOOP_NONBLOCK); 2269 ev_loop (w->other, EVLOOP_NONBLOCK);
2157} 2270}
2158 2271
2159static void 2272static void
2160embed_cb (EV_P_ ev_io *io, int revents) 2273embed_io_cb (EV_P_ ev_io *io, int revents)
2161{ 2274{
2162 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2275 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2163 2276
2164 if (ev_cb (w)) 2277 if (ev_cb (w))
2165 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2278 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2166 else 2279 else
2167 ev_embed_sweep (loop, w); 2280 ev_loop (w->other, EVLOOP_NONBLOCK);
2168} 2281}
2282
2283static void
2284embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2285{
2286 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2287
2288 {
2289 struct ev_loop *loop = w->other;
2290
2291 while (fdchangecnt)
2292 {
2293 fd_reify (EV_A);
2294 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2295 }
2296 }
2297}
2298
2299#if 0
2300static void
2301embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2302{
2303 ev_idle_stop (EV_A_ idle);
2304}
2305#endif
2169 2306
2170void 2307void
2171ev_embed_start (EV_P_ ev_embed *w) 2308ev_embed_start (EV_P_ ev_embed *w)
2172{ 2309{
2173 if (expect_false (ev_is_active (w))) 2310 if (expect_false (ev_is_active (w)))
2174 return; 2311 return;
2175 2312
2176 { 2313 {
2177 struct ev_loop *loop = w->loop; 2314 struct ev_loop *loop = w->other;
2178 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2315 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2179 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2316 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2180 } 2317 }
2181 2318
2182 ev_set_priority (&w->io, ev_priority (w)); 2319 ev_set_priority (&w->io, ev_priority (w));
2183 ev_io_start (EV_A_ &w->io); 2320 ev_io_start (EV_A_ &w->io);
2184 2321
2322 ev_prepare_init (&w->prepare, embed_prepare_cb);
2323 ev_set_priority (&w->prepare, EV_MINPRI);
2324 ev_prepare_start (EV_A_ &w->prepare);
2325
2326 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2327
2185 ev_start (EV_A_ (W)w, 1); 2328 ev_start (EV_A_ (W)w, 1);
2186} 2329}
2187 2330
2188void 2331void
2189ev_embed_stop (EV_P_ ev_embed *w) 2332ev_embed_stop (EV_P_ ev_embed *w)
… …
2191 clear_pending (EV_A_ (W)w); 2334 clear_pending (EV_A_ (W)w);
2192 if (expect_false (!ev_is_active (w))) 2335 if (expect_false (!ev_is_active (w)))
2193 return; 2336 return;
2194 2337
2195 ev_io_stop (EV_A_ &w->io); 2338 ev_io_stop (EV_A_ &w->io);
2339 ev_prepare_stop (EV_A_ &w->prepare);
2196 2340
2197 ev_stop (EV_A_ (W)w); 2341 ev_stop (EV_A_ (W)w);
2198} 2342}
2199#endif 2343#endif
2200 2344
… …
2289 ev_timer_set (&once->to, timeout, 0.); 2433 ev_timer_set (&once->to, timeout, 0.);
2290 ev_timer_start (EV_A_ &once->to); 2434 ev_timer_start (EV_A_ &once->to);
2291 } 2435 }
2292} 2436}
2293 2437
2438#if EV_MULTIPLICITY
2439 #include "ev_wrap.h"
2440#endif
2441
2294#ifdef __cplusplus 2442#ifdef __cplusplus
2295} 2443}
2296#endif 2444#endif
2297 2445

Diff Legend

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