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

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

Diff Legend

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