[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/19] only one flag is needed for alarm_timer
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 05/19] only one flag is needed for alarm_timer |
Date: |
Mon, 21 Dec 2009 09:09:16 +0100 |
The ALARM_FLAG_DYNTICKS can be testing simply by checking if there is
a rearm function.
Signed-off-by: Paolo Bonzini <address@hidden>
---
vl.c | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/vl.c b/vl.c
index 58e57c1..efffaf1 100644
--- a/vl.c
+++ b/vl.c
@@ -779,20 +779,17 @@ struct QEMUTimer {
struct qemu_alarm_timer {
char const *name;
- unsigned int flags;
-
int (*start)(struct qemu_alarm_timer *t);
void (*stop)(struct qemu_alarm_timer *t);
void (*rearm)(struct qemu_alarm_timer *t);
void *priv;
-};
-#define ALARM_FLAG_DYNTICKS 0x1
-#define ALARM_FLAG_EXPIRED 0x2
+ unsigned int expired;
+};
static inline int alarm_has_dynticks(struct qemu_alarm_timer *t)
{
- return t && (t->flags & ALARM_FLAG_DYNTICKS);
+ return t && t->rearm;
}
static void qemu_rearm_alarm_timer(struct qemu_alarm_timer *t)
@@ -928,18 +925,18 @@ static int64_t qemu_icount_round(int64_t count)
static struct qemu_alarm_timer alarm_timers[] = {
#ifndef _WIN32
#ifdef __linux__
- {"dynticks", ALARM_FLAG_DYNTICKS, dynticks_start_timer,
+ {"dynticks", dynticks_start_timer,
dynticks_stop_timer, dynticks_rearm_timer, NULL},
/* HPET - if available - is preferred */
- {"hpet", 0, hpet_start_timer, hpet_stop_timer, NULL, NULL},
+ {"hpet", hpet_start_timer, hpet_stop_timer, NULL, NULL},
/* ...otherwise try RTC */
- {"rtc", 0, rtc_start_timer, rtc_stop_timer, NULL, NULL},
+ {"rtc", rtc_start_timer, rtc_stop_timer, NULL, NULL},
#endif
- {"unix", 0, unix_start_timer, unix_stop_timer, NULL, NULL},
+ {"unix", unix_start_timer, unix_stop_timer, NULL, NULL},
#else
- {"dynticks", ALARM_FLAG_DYNTICKS, win32_start_timer,
+ {"dynticks", win32_start_timer,
win32_stop_timer, win32_rearm_timer, &alarm_win32_data},
- {"win32", 0, win32_start_timer,
+ {"win32", win32_start_timer,
win32_stop_timer, NULL, &alarm_win32_data},
#endif
{NULL, }
@@ -1087,7 +1084,7 @@ void qemu_mod_timer(QEMUTimer *ts, int64_t expire_time)
/* Rearm if necessary */
if (pt == &active_timers[ts->clock->type]) {
- if ((alarm_timer->flags & ALARM_FLAG_EXPIRED) == 0) {
+ if (!alarm_timer->expired) {
qemu_rearm_alarm_timer(alarm_timer);
}
/* Interrupt execution to force deadline recalculation. */
@@ -1243,7 +1240,7 @@ static void host_alarm_handler(int host_signum)
qemu_timer_expired(active_timers[QEMU_CLOCK_HOST],
qemu_get_clock(host_clock))) {
qemu_event_increment();
- if (alarm_timer) alarm_timer->flags |= ALARM_FLAG_EXPIRED;
+ if (alarm_timer) alarm_timer->expired = 1;
#ifndef CONFIG_IOTHREAD
if (next_cpu) {
@@ -1472,6 +1469,7 @@ static void dynticks_rearm_timer(struct qemu_alarm_timer
*t)
int64_t nearest_delta_us = INT64_MAX;
int64_t current_us;
+ assert(alarm_has_dynticks(t));
if (!active_timers[QEMU_CLOCK_REALTIME] &&
!active_timers[QEMU_CLOCK_VIRTUAL] &&
!active_timers[QEMU_CLOCK_HOST])
@@ -1587,6 +1585,7 @@ static void win32_rearm_timer(struct qemu_alarm_timer *t)
{
struct qemu_alarm_win32 *data = t->priv;
+ assert(alarm_has_dynticks(t));
if (!active_timers[QEMU_CLOCK_REALTIME] &&
!active_timers[QEMU_CLOCK_VIRTUAL] &&
!active_timers[QEMU_CLOCK_HOST])
@@ -3993,8 +3992,8 @@ void main_loop_wait(int timeout)
slirp_select_poll(&rfds, &wfds, &xfds, (ret < 0));
/* rearm timer, if not periodic */
- if (alarm_timer->flags & ALARM_FLAG_EXPIRED) {
- alarm_timer->flags &= ~ALARM_FLAG_EXPIRED;
+ if (alarm_timer->expired) {
+ alarm_timer->expired = 0;
qemu_rearm_alarm_timer(alarm_timer);
}
--
1.6.5.2
- [Qemu-devel] [PATCH 00/19][RFC] Cleanups + split timer handling out of vl.o, Paolo Bonzini, 2009/12/21
- [Qemu-devel] [PATCH 01/19] centralize handling of -icount, Paolo Bonzini, 2009/12/21
- [Qemu-devel] [PATCH 02/19] add qemu_icount_round, Paolo Bonzini, 2009/12/21
- [Qemu-devel] [PATCH 03/19] avoid dubiously clever code in win32_start_timer, Paolo Bonzini, 2009/12/21
- [Qemu-devel] [PATCH 05/19] only one flag is needed for alarm_timer,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 04/19] fix error in win32_rearm_timer, Paolo Bonzini, 2009/12/21
- [Qemu-devel] [PATCH 07/19] add qemu_get_clock_ns, Paolo Bonzini, 2009/12/21
- [Qemu-devel] [PATCH 09/19] remove qemu_rearm_alarm_timer from main loop, Paolo Bonzini, 2009/12/21
- [Qemu-devel] [PATCH 08/19] move kbd/mouse events to event.c, Paolo Bonzini, 2009/12/21
- [Qemu-devel] [PATCH 11/19] use a bottom half to run timers, Paolo Bonzini, 2009/12/21
[Qemu-devel] [PATCH 10/19] add qemu_bh_scheduled, Paolo Bonzini, 2009/12/21