mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-timer: Add and use new function qemu_timer_expired_ns

Browse Source 
This simply moves code which is used three times
into a new function thus improving readability.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
This commit is contained in:
Stefan Weil 2011-03-24 21:31:24 +01:00
parent 430a3c1806
commit 45c7b37fb9
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qemu-timer.c
View File

@ -183,6 +183,11 @@ struct qemu_alarm_timer {
static struct qemu_alarm_timer *alarm_timer; static struct qemu_alarm_timer *alarm_timer;
static bool qemu_timer_expired_ns(QEMUTimer *timer_head, int64_t current_time)
{
return timer_head && (timer_head->expire_time <= current_time);
}
int qemu_alarm_pending(void) int qemu_alarm_pending(void)
{ {
return alarm_timer->pending; return alarm_timer->pending;
@ -528,10 +533,9 @@ static void qemu_mod_timer_ns(QEMUTimer *ts, int64_t expire_time)
pt = &active_timers[ts->clock->type]; pt = &active_timers[ts->clock->type];
for(;;) { for(;;) {
t = *pt; t = *pt;
if (!t) if (!qemu_timer_expired_ns(t, expire_time)) {
break;
if (t->expire_time > expire_time)
break; break;
}
pt = &t->next; pt = &t->next;
} }
ts->expire_time = expire_time; ts->expire_time = expire_time;
@ -570,9 +574,7 @@ int qemu_timer_pending(QEMUTimer *ts)
int qemu_timer_expired(QEMUTimer *timer_head, int64_t current_time) int qemu_timer_expired(QEMUTimer *timer_head, int64_t current_time)
{ {
if (!timer_head) return qemu_timer_expired_ns(timer_head, current_time * timer_head->scale);
return 0;
return (timer_head->expire_time <= current_time * timer_head->scale);
} }
static void qemu_run_timers(QEMUClock *clock) static void qemu_run_timers(QEMUClock *clock)
@ -587,8 +589,9 @@ static void qemu_run_timers(QEMUClock *clock)
ptimer_head = &active_timers[clock->type]; ptimer_head = &active_timers[clock->type];
for(;;) { for(;;) {
ts = *ptimer_head; ts = *ptimer_head;
if (!ts || ts->expire_time > current_time) if (!qemu_timer_expired_ns(ts, current_time)) {
break; break;
}
/* remove timer from the list before calling the callback */ /* remove timer from the list before calling the callback */
*ptimer_head = ts->next; *ptimer_head = ts->next;
ts->next = NULL; ts->next = NULL;