ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rearm timers in qemu_mod_timer when needed (Anders Melchiorsen). 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3890 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
balrog 2008-01-05 19:41:47 +00:00
parent 6d1f177831
commit d5d08334d4
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vl.c
View File

@ -822,7 +822,7 @@ struct qemu_alarm_timer {
}; };
#define ALARM_FLAG_DYNTICKS 0x1 #define ALARM_FLAG_DYNTICKS 0x1
#define ALARM_FLAG_MODIFIED 0x2 #define ALARM_FLAG_EXPIRED 0x2
static inline int alarm_has_dynticks(struct qemu_alarm_timer *t) static inline int alarm_has_dynticks(struct qemu_alarm_timer *t)
{ {
@ -834,11 +834,6 @@ static void qemu_rearm_alarm_timer(struct qemu_alarm_timer *t)
if (!alarm_has_dynticks(t)) if (!alarm_has_dynticks(t))
return; return;
if (!(t->flags & ALARM_FLAG_MODIFIED))
return;
t->flags &= ~(ALARM_FLAG_MODIFIED);
t->rearm(t); t->rearm(t);
} }
@ -1001,8 +996,6 @@ void qemu_del_timer(QEMUTimer *ts)
{ {
QEMUTimer **pt, *t; QEMUTimer **pt, *t;
alarm_timer->flags |= ALARM_FLAG_MODIFIED;
/* NOTE: this code must be signal safe because /* NOTE: this code must be signal safe because
qemu_timer_expired() can be called from a signal. */ qemu_timer_expired() can be called from a signal. */
pt = &active_timers[ts->clock->type]; pt = &active_timers[ts->clock->type];
@ -1041,6 +1034,11 @@ void qemu_mod_timer(QEMUTimer *ts, int64_t expire_time)
ts->expire_time = expire_time; ts->expire_time = expire_time;
ts->next = *pt; ts->next = *pt;
*pt = ts; *pt = ts;
/* Rearm if necessary */
if ((alarm_timer->flags & ALARM_FLAG_EXPIRED) == 0 &&
pt == &active_timers[ts->clock->type])
qemu_rearm_alarm_timer(alarm_timer);
} }
int qemu_timer_pending(QEMUTimer *ts) int qemu_timer_pending(QEMUTimer *ts)
@ -1193,8 +1191,9 @@ static void host_alarm_handler(int host_signum)
#endif #endif
CPUState *env = next_cpu; CPUState *env = next_cpu;
alarm_timer->flags |= ALARM_FLAG_EXPIRED;
if (env) { if (env) {
alarm_timer->flags |= ALARM_FLAG_MODIFIED;
/* stop the currently executing cpu because a timer occured */ /* stop the currently executing cpu because a timer occured */
cpu_interrupt(env, CPU_INTERRUPT_EXIT); cpu_interrupt(env, CPU_INTERRUPT_EXIT);
#ifdef USE_KQEMU #ifdef USE_KQEMU
@ -7396,7 +7395,10 @@ void main_loop_wait(int timeout)
qemu_run_timers(&active_timers[QEMU_TIMER_REALTIME], qemu_run_timers(&active_timers[QEMU_TIMER_REALTIME],
qemu_get_clock(rt_clock)); qemu_get_clock(rt_clock));
if (alarm_timer->flags & ALARM_FLAG_EXPIRED) {
alarm_timer->flags &= ~(ALARM_FLAG_EXPIRED);
qemu_rearm_alarm_timer(alarm_timer); qemu_rearm_alarm_timer(alarm_timer);
}
/* Check bottom-halves last in case any of the earlier events triggered /* Check bottom-halves last in case any of the earlier events triggered
them. */ them. */