[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/18] new function qemu_icount_delta
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 14/18] new function qemu_icount_delta |
Date: |
Wed, 10 Mar 2010 11:38:51 +0100 |
Tweaking the rounding in qemu_next_deadline ensures that there's
no change whatsoever.
Signed-off-by: Paolo Bonzini <address@hidden>
---
vl.c | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/vl.c b/vl.c
index 18bd2ee..d10319f 100644
--- a/vl.c
+++ b/vl.c
@@ -548,6 +548,22 @@ static int64_t cpu_get_clock(void)
}
}
+#ifndef CONFIG_IOTHREAD
+static int64_t qemu_icount_delta(void)
+{
+ if (!use_icount) {
+ return 5000 * (int64_t) 1000000;
+ } else if (use_icount == 1) {
+ /* When not using an adaptive execution frequency
+ we tend to get badly out of sync with real time,
+ so just delay for a reasonable amount of time. */
+ return 0;
+ } else {
+ return cpu_get_icount() - cpu_get_clock();
+ }
+}
+#endif
+
/* enable cpu_get_ticks() */
void cpu_enable_ticks(void)
{
@@ -4052,25 +4068,16 @@ static int qemu_calculate_timeout(void)
timeout = 5000;
else if (tcg_has_work())
timeout = 0;
- else if (!use_icount)
- timeout = 5000;
else {
/* XXX: use timeout computed from timers */
int64_t add;
int64_t delta;
/* Advance virtual time to the next event. */
- if (use_icount == 1) {
- /* When not using an adaptive execution frequency
- we tend to get badly out of sync with real time,
- so just delay for a reasonable amount of time. */
- delta = 0;
- } else {
- delta = cpu_get_icount() - cpu_get_clock();
- }
+ delta = qemu_icount_delta();
if (delta > 0) {
/* If virtual time is ahead of real time then just
wait for IO. */
- timeout = (delta / 1000000) + 1;
+ timeout = (delta + 999999) / 1000000;
} else {
/* Wait for either IO to occur or the next
timer event. */
--
1.6.6
- [Qemu-devel] [PATCH 04/18] more alarm timer cleanup, (continued)
- [Qemu-devel] [PATCH 04/18] more alarm timer cleanup, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 05/18] do not use qemu_event_increment outside qemu_notify_event, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 07/18] remove qemu_rearm_alarm_timer from main loop, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 08/18] extract timer handling out of main_loop_wait, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 06/18] tweak qemu_notify_event, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 10/18] introduce and use qemu_clock_enable, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 11/18] centralize handling of -icount, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 09/18] change qemu_run_timers interface, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 13/18] add qemu_alarm_pending, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 12/18] add qemu_icount_round, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 14/18] new function qemu_icount_delta,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 15/18] move vmstate registration of vmstate_timers earlier, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 16/18] place together more #ifdef CONFIG_IOTHREAD blocks, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 17/18] disentangle tcg and deadline calculation, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 18/18] split out qemu-timer.c, Paolo Bonzini, 2010/03/10