haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

use nanoseconds everywhere for timeout computation

Browse source 
Suggested by Aurelien Jarno.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Paolo Bonzini 2011-02-03 14:48:59 +01:00 committed by Anthony Liguori
parent eb60260de0
commit 9c13246ac1
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
qemu-timer.c
View file

@ -197,8 +197,8 @@ static void qemu_rearm_alarm_timer(struct qemu_alarm_timer *t)
t->rearm(t); t->rearm(t);
} }
/* TODO: MIN_TIMER_REARM_US should be optimized */ /* TODO: MIN_TIMER_REARM_NS should be optimized */
#define MIN_TIMER_REARM_US 250 #define MIN_TIMER_REARM_NS 250000
#ifdef _WIN32 #ifdef _WIN32
@ -698,11 +698,11 @@ int64_t qemu_next_deadline(void)
if (active_timers[QEMU_CLOCK_VIRTUAL]) { if (active_timers[QEMU_CLOCK_VIRTUAL]) {
delta = active_timers[QEMU_CLOCK_VIRTUAL]->expire_time - delta = active_timers[QEMU_CLOCK_VIRTUAL]->expire_time -
qemu_get_clock(vm_clock); qemu_get_clock_ns(vm_clock);
} }
if (active_timers[QEMU_CLOCK_HOST]) { if (active_timers[QEMU_CLOCK_HOST]) {
int64_t hdelta = active_timers[QEMU_CLOCK_HOST]->expire_time - int64_t hdelta = active_timers[QEMU_CLOCK_HOST]->expire_time -
qemu_get_clock(host_clock); qemu_get_clock_ns(host_clock);
if (hdelta < delta) if (hdelta < delta)
delta = hdelta; delta = hdelta;
} }
@ -727,17 +727,17 @@ static uint64_t qemu_next_deadline_dyntick(void)
if (use_icount) if (use_icount)
delta = INT32_MAX; delta = INT32_MAX;
else else
delta = (qemu_next_deadline() + 999) / 1000; delta = qemu_next_deadline();
if (active_timers[QEMU_CLOCK_REALTIME]) { if (active_timers[QEMU_CLOCK_REALTIME]) {
rtdelta = (active_timers[QEMU_CLOCK_REALTIME]->expire_time - rtdelta = (active_timers[QEMU_CLOCK_REALTIME]->expire_time * 1000000 -
qemu_get_clock(rt_clock))*1000; qemu_get_clock_ns(rt_clock));
if (rtdelta < delta) if (rtdelta < delta)
delta = rtdelta; delta = rtdelta;
} }
if (delta < MIN_TIMER_REARM_US) if (delta < MIN_TIMER_REARM_NS)
delta = MIN_TIMER_REARM_US; delta = MIN_TIMER_REARM_NS;
return delta; return delta;
} }
@ -887,8 +887,8 @@ static void dynticks_rearm_timer(struct qemu_alarm_timer *t)
{ {
timer_t host_timer = (timer_t)(long)t->priv; timer_t host_timer = (timer_t)(long)t->priv;
struct itimerspec timeout; struct itimerspec timeout;
int64_t nearest_delta_us = INT64_MAX; int64_t nearest_delta_ns = INT64_MAX;
int64_t current_us; int64_t current_ns;
assert(alarm_has_dynticks(t)); assert(alarm_has_dynticks(t));
if (!active_timers[QEMU_CLOCK_REALTIME] && if (!active_timers[QEMU_CLOCK_REALTIME] &&
@ -896,7 +896,7 @@ static void dynticks_rearm_timer(struct qemu_alarm_timer *t)
!active_timers[QEMU_CLOCK_HOST]) !active_timers[QEMU_CLOCK_HOST])
return; return;
nearest_delta_us = qemu_next_deadline_dyntick(); nearest_delta_ns = qemu_next_deadline_dyntick();
/* check whether a timer is already running */ /* check whether a timer is already running */
if (timer_gettime(host_timer, &timeout)) { if (timer_gettime(host_timer, &timeout)) {
@ -904,14 +904,14 @@ static void dynticks_rearm_timer(struct qemu_alarm_timer *t)
fprintf(stderr, "Internal timer error: aborting\n"); fprintf(stderr, "Internal timer error: aborting\n");
exit(1); exit(1);
} }
current_us = timeout.it_value.tv_sec * 1000000 + timeout.it_value.tv_nsec/1000; current_ns = timeout.it_value.tv_sec * 1000000000LL + timeout.it_value.tv_nsec;
if (current_us && current_us <= nearest_delta_us) if (current_ns && current_ns <= nearest_delta_ns)
return; return;
timeout.it_interval.tv_sec = 0; timeout.it_interval.tv_sec = 0;
timeout.it_interval.tv_nsec = 0; /* 0 for one-shot timer */ timeout.it_interval.tv_nsec = 0; /* 0 for one-shot timer */
timeout.it_value.tv_sec = nearest_delta_us / 1000000; timeout.it_value.tv_sec = nearest_delta_ns / 1000000000;
timeout.it_value.tv_nsec = (nearest_delta_us % 1000000) * 1000; timeout.it_value.tv_nsec = nearest_delta_ns % 1000000000;
if (timer_settime(host_timer, 0 /* RELATIVE */, &timeout, NULL)) { if (timer_settime(host_timer, 0 /* RELATIVE */, &timeout, NULL)) {
perror("settime"); perror("settime");
fprintf(stderr, "Internal timer error: aborting\n"); fprintf(stderr, "Internal timer error: aborting\n");