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

Comparing libev/ev.c (file contents):
Revision 1.171 by root, Sun Dec 9 02:12:43 2007 UTC vs.
Revision 1.195 by root, Sat Dec 22 11:44: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/* 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{
977 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
904 return EVBACKEND_EPOLL 978 return EVBACKEND_KQUEUE
905 | EVBACKEND_KQUEUE
906 | EVBACKEND_PORT; 979 | EVBACKEND_PORT;
907} 980}
908 981
909unsigned int 982unsigned int
910ev_backend (EV_P) 983ev_backend (EV_P)
… …
914 987
915unsigned int 988unsigned int
916ev_loop_count (EV_P) 989ev_loop_count (EV_P)
917{ 990{
918 return loop_count; 991 return loop_count;
992}
993
994void
995ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
996{
997 io_blocktime = interval;
998}
999
1000void
1001ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1002{
1003 timeout_blocktime = interval;
919} 1004}
920 1005
921static void noinline 1006static void noinline
922loop_init (EV_P_ unsigned int flags) 1007loop_init (EV_P_ unsigned int flags)
923{ 1008{
… …
934 ev_rt_now = ev_time (); 1019 ev_rt_now = ev_time ();
935 mn_now = get_clock (); 1020 mn_now = get_clock ();
936 now_floor = mn_now; 1021 now_floor = mn_now;
937 rtmn_diff = ev_rt_now - mn_now; 1022 rtmn_diff = ev_rt_now - mn_now;
938 1023
1024 io_blocktime = 0.;
1025 timeout_blocktime = 0.;
1026
939 /* pid check not overridable via env */ 1027 /* pid check not overridable via env */
940#ifndef _WIN32 1028#ifndef _WIN32
941 if (flags & EVFLAG_FORKCHECK) 1029 if (flags & EVFLAG_FORKCHECK)
942 curpid = getpid (); 1030 curpid = getpid ();
943#endif 1031#endif
… …
1011 array_free (pending, [i]); 1099 array_free (pending, [i]);
1012#if EV_IDLE_ENABLE 1100#if EV_IDLE_ENABLE
1013 array_free (idle, [i]); 1101 array_free (idle, [i]);
1014#endif 1102#endif
1015 } 1103 }
1104
1105 ev_free (anfds); anfdmax = 0;
1016 1106
1017 /* have to use the microsoft-never-gets-it-right macro */ 1107 /* have to use the microsoft-never-gets-it-right macro */
1018 array_free (fdchange, EMPTY); 1108 array_free (fdchange, EMPTY);
1019 array_free (timer, EMPTY); 1109 array_free (timer, EMPTY);
1020#if EV_PERIODIC_ENABLE 1110#if EV_PERIODIC_ENABLE
1021 array_free (periodic, EMPTY); 1111 array_free (periodic, EMPTY);
1112#endif
1113#if EV_FORK_ENABLE
1114 array_free (fork, EMPTY);
1022#endif 1115#endif
1023 array_free (prepare, EMPTY); 1116 array_free (prepare, EMPTY);
1024 array_free (check, EMPTY); 1117 array_free (check, EMPTY);
1025 1118
1026 backend = 0; 1119 backend = 0;
… …
1196void inline_size 1289void inline_size
1197timers_reify (EV_P) 1290timers_reify (EV_P)
1198{ 1291{
1199 while (timercnt && ((WT)timers [0])->at <= mn_now) 1292 while (timercnt && ((WT)timers [0])->at <= mn_now)
1200 { 1293 {
1201 ev_timer *w = timers [0]; 1294 ev_timer *w = (ev_timer *)timers [0];
1202 1295
1203 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1296 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1204 1297
1205 /* first reschedule or stop timer */ 1298 /* first reschedule or stop timer */
1206 if (w->repeat) 1299 if (w->repeat)
… …
1209 1302
1210 ((WT)w)->at += w->repeat; 1303 ((WT)w)->at += w->repeat;
1211 if (((WT)w)->at < mn_now) 1304 if (((WT)w)->at < mn_now)
1212 ((WT)w)->at = mn_now; 1305 ((WT)w)->at = mn_now;
1213 1306
1214 downheap ((WT *)timers, timercnt, 0); 1307 downheap (timers, timercnt, 0);
1215 } 1308 }
1216 else 1309 else
1217 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1310 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1218 1311
1219 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1312 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1224void inline_size 1317void inline_size
1225periodics_reify (EV_P) 1318periodics_reify (EV_P)
1226{ 1319{
1227 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1320 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1228 { 1321 {
1229 ev_periodic *w = periodics [0]; 1322 ev_periodic *w = (ev_periodic *)periodics [0];
1230 1323
1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1324 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1232 1325
1233 /* first reschedule or stop timer */ 1326 /* first reschedule or stop timer */
1234 if (w->reschedule_cb) 1327 if (w->reschedule_cb)
1235 { 1328 {
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1329 ((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)); 1330 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1238 downheap ((WT *)periodics, periodiccnt, 0); 1331 downheap (periodics, periodiccnt, 0);
1239 } 1332 }
1240 else if (w->interval) 1333 else if (w->interval)
1241 { 1334 {
1242 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1335 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1336 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)); 1337 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); 1338 downheap (periodics, periodiccnt, 0);
1245 } 1339 }
1246 else 1340 else
1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1341 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1248 1342
1249 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1343 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1256 int i; 1350 int i;
1257 1351
1258 /* adjust periodics after time jump */ 1352 /* adjust periodics after time jump */
1259 for (i = 0; i < periodiccnt; ++i) 1353 for (i = 0; i < periodiccnt; ++i)
1260 { 1354 {
1261 ev_periodic *w = periodics [i]; 1355 ev_periodic *w = (ev_periodic *)periodics [i];
1262 1356
1263 if (w->reschedule_cb) 1357 if (w->reschedule_cb)
1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1358 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1265 else if (w->interval) 1359 else if (w->interval)
1266 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1360 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1267 } 1361 }
1268 1362
1269 /* now rebuild the heap */ 1363 /* now rebuild the heap */
1270 for (i = periodiccnt >> 1; i--; ) 1364 for (i = periodiccnt >> 1; i--; )
1271 downheap ((WT *)periodics, periodiccnt, i); 1365 downheap (periodics, periodiccnt, i);
1272} 1366}
1273#endif 1367#endif
1274 1368
1275#if EV_IDLE_ENABLE 1369#if EV_IDLE_ENABLE
1276void inline_size 1370void inline_size
… …
1293 } 1387 }
1294 } 1388 }
1295} 1389}
1296#endif 1390#endif
1297 1391
1298int inline_size 1392void inline_speed
1299time_update_monotonic (EV_P) 1393time_update (EV_P_ ev_tstamp max_block)
1300{ 1394{
1395 int i;
1396
1397#if EV_USE_MONOTONIC
1398 if (expect_true (have_monotonic))
1399 {
1400 ev_tstamp odiff = rtmn_diff;
1401
1301 mn_now = get_clock (); 1402 mn_now = get_clock ();
1302 1403
1404 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1405 /* interpolate in the meantime */
1303 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1406 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1304 { 1407 {
1305 ev_rt_now = rtmn_diff + mn_now; 1408 ev_rt_now = rtmn_diff + mn_now;
1306 return 0; 1409 return;
1307 } 1410 }
1308 else 1411
1309 {
1310 now_floor = mn_now; 1412 now_floor = mn_now;
1311 ev_rt_now = ev_time (); 1413 ev_rt_now = ev_time ();
1312 return 1;
1313 }
1314}
1315 1414
1316void inline_size 1415 /* loop a few times, before making important decisions.
1317time_update (EV_P) 1416 * on the choice of "4": one iteration isn't enough,
1318{ 1417 * in case we get preempted during the calls to
1319 int i; 1418 * ev_time and get_clock. a second call is almost guaranteed
1320 1419 * to succeed in that case, though. and looping a few more times
1321#if EV_USE_MONOTONIC 1420 * doesn't hurt either as we only do this on time-jumps or
1322 if (expect_true (have_monotonic)) 1421 * in the unlikely event of having been preempted here.
1323 { 1422 */
1324 if (time_update_monotonic (EV_A)) 1423 for (i = 4; --i; )
1325 { 1424 {
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; 1425 rtmn_diff = ev_rt_now - mn_now;
1339 1426
1340 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1427 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1341 return; /* all is well */ 1428 return; /* all is well */
1342 1429
1343 ev_rt_now = ev_time (); 1430 ev_rt_now = ev_time ();
1344 mn_now = get_clock (); 1431 mn_now = get_clock ();
1345 now_floor = mn_now; 1432 now_floor = mn_now;
1346 } 1433 }
1347 1434
1348# if EV_PERIODIC_ENABLE 1435# if EV_PERIODIC_ENABLE
1349 periodics_reschedule (EV_A); 1436 periodics_reschedule (EV_A);
1350# endif 1437# endif
1351 /* no timer adjustment, as the monotonic clock doesn't jump */ 1438 /* no timer adjustment, as the monotonic clock doesn't jump */
1352 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1439 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1353 }
1354 } 1440 }
1355 else 1441 else
1356#endif 1442#endif
1357 { 1443 {
1358 ev_rt_now = ev_time (); 1444 ev_rt_now = ev_time ();
1359 1445
1360 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1446 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1361 { 1447 {
1362#if EV_PERIODIC_ENABLE 1448#if EV_PERIODIC_ENABLE
1363 periodics_reschedule (EV_A); 1449 periodics_reschedule (EV_A);
1364#endif 1450#endif
1365
1366 /* adjust timers. this is easy, as the offset is the same for all of them */ 1451 /* adjust timers. this is easy, as the offset is the same for all of them */
1367 for (i = 0; i < timercnt; ++i) 1452 for (i = 0; i < timercnt; ++i)
1368 ((WT)timers [i])->at += ev_rt_now - mn_now; 1453 ((WT)timers [i])->at += ev_rt_now - mn_now;
1369 } 1454 }
1370 1455
… …
1433 /* update fd-related kernel structures */ 1518 /* update fd-related kernel structures */
1434 fd_reify (EV_A); 1519 fd_reify (EV_A);
1435 1520
1436 /* calculate blocking time */ 1521 /* calculate blocking time */
1437 { 1522 {
1438 ev_tstamp block; 1523 ev_tstamp waittime = 0.;
1524 ev_tstamp sleeptime = 0.;
1439 1525
1440 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1526 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1441 block = 0.; /* do not block at all */
1442 else
1443 { 1527 {
1444 /* update time to cancel out callback processing overhead */ 1528 /* 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); 1529 time_update (EV_A_ 1e100);
1448 else
1449#endif
1450 {
1451 ev_rt_now = ev_time ();
1452 mn_now = ev_rt_now;
1453 }
1454 1530
1455 block = MAX_BLOCKTIME; 1531 waittime = MAX_BLOCKTIME;
1456 1532
1457 if (timercnt) 1533 if (timercnt)
1458 { 1534 {
1459 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1535 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1460 if (block > to) block = to; 1536 if (waittime > to) waittime = to;
1461 } 1537 }
1462 1538
1463#if EV_PERIODIC_ENABLE 1539#if EV_PERIODIC_ENABLE
1464 if (periodiccnt) 1540 if (periodiccnt)
1465 { 1541 {
1466 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1542 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1467 if (block > to) block = to; 1543 if (waittime > to) waittime = to;
1468 } 1544 }
1469#endif 1545#endif
1470 1546
1471 if (expect_false (block < 0.)) block = 0.; 1547 if (expect_false (waittime < timeout_blocktime))
1548 waittime = timeout_blocktime;
1549
1550 sleeptime = waittime - backend_fudge;
1551
1552 if (expect_true (sleeptime > io_blocktime))
1553 sleeptime = io_blocktime;
1554
1555 if (sleeptime)
1556 {
1557 ev_sleep (sleeptime);
1558 waittime -= sleeptime;
1559 }
1472 } 1560 }
1473 1561
1474 ++loop_count; 1562 ++loop_count;
1475 backend_poll (EV_A_ block); 1563 backend_poll (EV_A_ waittime);
1564
1565 /* update ev_rt_now, do magic */
1566 time_update (EV_A_ waittime + sleeptime);
1476 } 1567 }
1477
1478 /* update ev_rt_now, do magic */
1479 time_update (EV_A);
1480 1568
1481 /* queue pending timers and reschedule them */ 1569 /* queue pending timers and reschedule them */
1482 timers_reify (EV_A); /* relative timers called last */ 1570 timers_reify (EV_A); /* relative timers called last */
1483#if EV_PERIODIC_ENABLE 1571#if EV_PERIODIC_ENABLE
1484 periodics_reify (EV_A); /* absolute timers called first */ 1572 periodics_reify (EV_A); /* absolute timers called first */
… …
1546ev_clear_pending (EV_P_ void *w) 1634ev_clear_pending (EV_P_ void *w)
1547{ 1635{
1548 W w_ = (W)w; 1636 W w_ = (W)w;
1549 int pending = w_->pending; 1637 int pending = w_->pending;
1550 1638
1551 if (!pending) 1639 if (expect_true (pending))
1640 {
1641 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1642 w_->pending = 0;
1643 p->w = 0;
1644 return p->events;
1645 }
1646 else
1552 return 0; 1647 return 0;
1553
1554 w_->pending = 0;
1555 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1556 p->w = 0;
1557
1558 return p->events;
1559} 1648}
1560 1649
1561void inline_size 1650void inline_size
1562pri_adjust (EV_P_ W w) 1651pri_adjust (EV_P_ W w)
1563{ 1652{
… …
1594 1683
1595 assert (("ev_io_start called with negative fd", fd >= 0)); 1684 assert (("ev_io_start called with negative fd", fd >= 0));
1596 1685
1597 ev_start (EV_A_ (W)w, 1); 1686 ev_start (EV_A_ (W)w, 1);
1598 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1687 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1599 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1688 wlist_add (&anfds[fd].head, (WL)w);
1600 1689
1601 fd_change (EV_A_ fd); 1690 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1691 w->events &= ~EV_IOFDSET;
1602} 1692}
1603 1693
1604void noinline 1694void noinline
1605ev_io_stop (EV_P_ ev_io *w) 1695ev_io_stop (EV_P_ ev_io *w)
1606{ 1696{
… …
1608 if (expect_false (!ev_is_active (w))) 1698 if (expect_false (!ev_is_active (w)))
1609 return; 1699 return;
1610 1700
1611 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1701 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1612 1702
1613 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1703 wlist_del (&anfds[w->fd].head, (WL)w);
1614 ev_stop (EV_A_ (W)w); 1704 ev_stop (EV_A_ (W)w);
1615 1705
1616 fd_change (EV_A_ w->fd); 1706 fd_change (EV_A_ w->fd, 1);
1617} 1707}
1618 1708
1619void noinline 1709void noinline
1620ev_timer_start (EV_P_ ev_timer *w) 1710ev_timer_start (EV_P_ ev_timer *w)
1621{ 1711{
… …
1625 ((WT)w)->at += mn_now; 1715 ((WT)w)->at += mn_now;
1626 1716
1627 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1717 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1628 1718
1629 ev_start (EV_A_ (W)w, ++timercnt); 1719 ev_start (EV_A_ (W)w, ++timercnt);
1630 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1720 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1631 timers [timercnt - 1] = w; 1721 timers [timercnt - 1] = (WT)w;
1632 upheap ((WT *)timers, timercnt - 1); 1722 upheap (timers, timercnt - 1);
1633 1723
1634 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1724 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1635} 1725}
1636 1726
1637void noinline 1727void noinline
… …
1639{ 1729{
1640 clear_pending (EV_A_ (W)w); 1730 clear_pending (EV_A_ (W)w);
1641 if (expect_false (!ev_is_active (w))) 1731 if (expect_false (!ev_is_active (w)))
1642 return; 1732 return;
1643 1733
1644 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1734 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1645 1735
1646 { 1736 {
1647 int active = ((W)w)->active; 1737 int active = ((W)w)->active;
1648 1738
1649 if (expect_true (--active < --timercnt)) 1739 if (expect_true (--active < --timercnt))
1650 { 1740 {
1651 timers [active] = timers [timercnt]; 1741 timers [active] = timers [timercnt];
1652 adjustheap ((WT *)timers, timercnt, active); 1742 adjustheap (timers, timercnt, active);
1653 } 1743 }
1654 } 1744 }
1655 1745
1656 ((WT)w)->at -= mn_now; 1746 ((WT)w)->at -= mn_now;
1657 1747
… …
1664 if (ev_is_active (w)) 1754 if (ev_is_active (w))
1665 { 1755 {
1666 if (w->repeat) 1756 if (w->repeat)
1667 { 1757 {
1668 ((WT)w)->at = mn_now + w->repeat; 1758 ((WT)w)->at = mn_now + w->repeat;
1669 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1759 adjustheap (timers, timercnt, ((W)w)->active - 1);
1670 } 1760 }
1671 else 1761 else
1672 ev_timer_stop (EV_A_ w); 1762 ev_timer_stop (EV_A_ w);
1673 } 1763 }
1674 else if (w->repeat) 1764 else if (w->repeat)
… …
1689 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1779 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1690 else if (w->interval) 1780 else if (w->interval)
1691 { 1781 {
1692 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1782 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1693 /* this formula differs from the one in periodic_reify because we do not always round up */ 1783 /* this formula differs from the one in periodic_reify because we do not always round up */
1694 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1784 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1695 } 1785 }
1786 else
1787 ((WT)w)->at = w->offset;
1696 1788
1697 ev_start (EV_A_ (W)w, ++periodiccnt); 1789 ev_start (EV_A_ (W)w, ++periodiccnt);
1698 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1790 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1699 periodics [periodiccnt - 1] = w; 1791 periodics [periodiccnt - 1] = (WT)w;
1700 upheap ((WT *)periodics, periodiccnt - 1); 1792 upheap (periodics, periodiccnt - 1);
1701 1793
1702 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1794 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1703} 1795}
1704 1796
1705void noinline 1797void noinline
… …
1707{ 1799{
1708 clear_pending (EV_A_ (W)w); 1800 clear_pending (EV_A_ (W)w);
1709 if (expect_false (!ev_is_active (w))) 1801 if (expect_false (!ev_is_active (w)))
1710 return; 1802 return;
1711 1803
1712 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1804 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1713 1805
1714 { 1806 {
1715 int active = ((W)w)->active; 1807 int active = ((W)w)->active;
1716 1808
1717 if (expect_true (--active < --periodiccnt)) 1809 if (expect_true (--active < --periodiccnt))
1718 { 1810 {
1719 periodics [active] = periodics [periodiccnt]; 1811 periodics [active] = periodics [periodiccnt];
1720 adjustheap ((WT *)periodics, periodiccnt, active); 1812 adjustheap (periodics, periodiccnt, active);
1721 } 1813 }
1722 } 1814 }
1723 1815
1724 ev_stop (EV_A_ (W)w); 1816 ev_stop (EV_A_ (W)w);
1725} 1817}
… …
1746 if (expect_false (ev_is_active (w))) 1838 if (expect_false (ev_is_active (w)))
1747 return; 1839 return;
1748 1840
1749 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1841 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1750 1842
1843 {
1844#ifndef _WIN32
1845 sigset_t full, prev;
1846 sigfillset (&full);
1847 sigprocmask (SIG_SETMASK, &full, &prev);
1848#endif
1849
1850 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1851
1852#ifndef _WIN32
1853 sigprocmask (SIG_SETMASK, &prev, 0);
1854#endif
1855 }
1856
1751 ev_start (EV_A_ (W)w, 1); 1857 ev_start (EV_A_ (W)w, 1);
1752 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1753 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1858 wlist_add (&signals [w->signum - 1].head, (WL)w);
1754 1859
1755 if (!((WL)w)->next) 1860 if (!((WL)w)->next)
1756 { 1861 {
1757#if _WIN32 1862#if _WIN32
1758 signal (w->signum, sighandler); 1863 signal (w->signum, sighandler);
… …
1771{ 1876{
1772 clear_pending (EV_A_ (W)w); 1877 clear_pending (EV_A_ (W)w);
1773 if (expect_false (!ev_is_active (w))) 1878 if (expect_false (!ev_is_active (w)))
1774 return; 1879 return;
1775 1880
1776 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1881 wlist_del (&signals [w->signum - 1].head, (WL)w);
1777 ev_stop (EV_A_ (W)w); 1882 ev_stop (EV_A_ (W)w);
1778 1883
1779 if (!signals [w->signum - 1].head) 1884 if (!signals [w->signum - 1].head)
1780 signal (w->signum, SIG_DFL); 1885 signal (w->signum, SIG_DFL);
1781} 1886}
… …
1788#endif 1893#endif
1789 if (expect_false (ev_is_active (w))) 1894 if (expect_false (ev_is_active (w)))
1790 return; 1895 return;
1791 1896
1792 ev_start (EV_A_ (W)w, 1); 1897 ev_start (EV_A_ (W)w, 1);
1793 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1898 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1794} 1899}
1795 1900
1796void 1901void
1797ev_child_stop (EV_P_ ev_child *w) 1902ev_child_stop (EV_P_ ev_child *w)
1798{ 1903{
1799 clear_pending (EV_A_ (W)w); 1904 clear_pending (EV_A_ (W)w);
1800 if (expect_false (!ev_is_active (w))) 1905 if (expect_false (!ev_is_active (w)))
1801 return; 1906 return;
1802 1907
1803 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1908 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1804 ev_stop (EV_A_ (W)w); 1909 ev_stop (EV_A_ (W)w);
1805} 1910}
1806 1911
1807#if EV_STAT_ENABLE 1912#if EV_STAT_ENABLE
1808 1913
… …
2150 2255
2151#if EV_EMBED_ENABLE 2256#if EV_EMBED_ENABLE
2152void noinline 2257void noinline
2153ev_embed_sweep (EV_P_ ev_embed *w) 2258ev_embed_sweep (EV_P_ ev_embed *w)
2154{ 2259{
2155 ev_loop (w->loop, EVLOOP_NONBLOCK); 2260 ev_loop (w->other, EVLOOP_NONBLOCK);
2156} 2261}
2157 2262
2158static void 2263static void
2159embed_cb (EV_P_ ev_io *io, int revents) 2264embed_io_cb (EV_P_ ev_io *io, int revents)
2160{ 2265{
2161 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2266 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2162 2267
2163 if (ev_cb (w)) 2268 if (ev_cb (w))
2164 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2269 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2165 else 2270 else
2166 ev_embed_sweep (loop, w); 2271 ev_loop (w->other, EVLOOP_NONBLOCK);
2167} 2272}
2273
2274static void
2275embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2276{
2277 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2278
2279 {
2280 struct ev_loop *loop = w->other;
2281
2282 while (fdchangecnt)
2283 {
2284 fd_reify (EV_A);
2285 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2286 }
2287 }
2288}
2289
2290#if 0
2291static void
2292embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2293{
2294 ev_idle_stop (EV_A_ idle);
2295}
2296#endif
2168 2297
2169void 2298void
2170ev_embed_start (EV_P_ ev_embed *w) 2299ev_embed_start (EV_P_ ev_embed *w)
2171{ 2300{
2172 if (expect_false (ev_is_active (w))) 2301 if (expect_false (ev_is_active (w)))
2173 return; 2302 return;
2174 2303
2175 { 2304 {
2176 struct ev_loop *loop = w->loop; 2305 struct ev_loop *loop = w->other;
2177 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2306 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2178 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2307 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2179 } 2308 }
2180 2309
2181 ev_set_priority (&w->io, ev_priority (w)); 2310 ev_set_priority (&w->io, ev_priority (w));
2182 ev_io_start (EV_A_ &w->io); 2311 ev_io_start (EV_A_ &w->io);
2183 2312
2313 ev_prepare_init (&w->prepare, embed_prepare_cb);
2314 ev_set_priority (&w->prepare, EV_MINPRI);
2315 ev_prepare_start (EV_A_ &w->prepare);
2316
2317 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2318
2184 ev_start (EV_A_ (W)w, 1); 2319 ev_start (EV_A_ (W)w, 1);
2185} 2320}
2186 2321
2187void 2322void
2188ev_embed_stop (EV_P_ ev_embed *w) 2323ev_embed_stop (EV_P_ ev_embed *w)
… …
2190 clear_pending (EV_A_ (W)w); 2325 clear_pending (EV_A_ (W)w);
2191 if (expect_false (!ev_is_active (w))) 2326 if (expect_false (!ev_is_active (w)))
2192 return; 2327 return;
2193 2328
2194 ev_io_stop (EV_A_ &w->io); 2329 ev_io_stop (EV_A_ &w->io);
2330 ev_prepare_stop (EV_A_ &w->prepare);
2195 2331
2196 ev_stop (EV_A_ (W)w); 2332 ev_stop (EV_A_ (W)w);
2197} 2333}
2198#endif 2334#endif
2199 2335
… …
2288 ev_timer_set (&once->to, timeout, 0.); 2424 ev_timer_set (&once->to, timeout, 0.);
2289 ev_timer_start (EV_A_ &once->to); 2425 ev_timer_start (EV_A_ &once->to);
2290 } 2426 }
2291} 2427}
2292 2428
2429#if EV_MULTIPLICITY
2430 #include "ev_wrap.h"
2431#endif
2432
2293#ifdef __cplusplus 2433#ifdef __cplusplus
2294} 2434}
2295#endif 2435#endif
2296 2436

Diff Legend

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