Commit 40daca54 authored by Alex Bligh's avatar Alex Bligh Committed by Stefan Hajnoczi

aio / timers: Rearrange timer.h & make legacy functions call non-legacy

Rearrange timer.h so it is in order by function type.

Make legacy functions call non-legacy functions rather than vice-versa.

Convert cpus.c to use new API.
Signed-off-by: default avatarAlex Bligh <alex@alex.org.uk>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 55a197da
This diff is collapsed.
......@@ -263,7 +263,7 @@ static int acpi_load_old(QEMUFile *f, void *opaque, int version_id)
return ret;
}
qemu_get_timer(f, s->ar.tmr.timer);
timer_get(f, s->ar.tmr.timer);
qemu_get_sbe64s(f, &s->ar.tmr.overflow_time);
qemu_get_be16s(f, (uint16_t *)s->ar.gpe.sts);
......
......@@ -449,7 +449,7 @@ static void tsc2005_save(QEMUFile *f, void *opaque)
qemu_put_be16s(f, &s->dav);
qemu_put_be16s(f, &s->data);
qemu_put_timer(f, s->timer);
timer_put(f, s->timer);
qemu_put_byte(f, s->enabled);
qemu_put_byte(f, s->host_mode);
qemu_put_byte(f, s->function);
......@@ -490,7 +490,7 @@ static int tsc2005_load(QEMUFile *f, void *opaque, int version_id)
qemu_get_be16s(f, &s->dav);
qemu_get_be16s(f, &s->data);
qemu_get_timer(f, s->timer);
timer_get(f, s->timer);
s->enabled = qemu_get_byte(f);
s->host_mode = qemu_get_byte(f);
s->function = qemu_get_byte(f);
......
......@@ -1020,7 +1020,7 @@ static void tsc210x_save(QEMUFile *f, void *opaque)
qemu_put_byte(f, s->irq);
qemu_put_be16s(f, &s->dav);
qemu_put_timer(f, s->timer);
timer_put(f, s->timer);
qemu_put_byte(f, s->enabled);
qemu_put_byte(f, s->host_mode);
qemu_put_byte(f, s->function);
......@@ -1066,7 +1066,7 @@ static int tsc210x_load(QEMUFile *f, void *opaque, int version_id)
s->irq = qemu_get_byte(f);
qemu_get_be16s(f, &s->dav);
qemu_get_timer(f, s->timer);
timer_get(f, s->timer);
s->enabled = qemu_get_byte(f);
s->host_mode = qemu_get_byte(f);
s->function = qemu_get_byte(f);
......
......@@ -363,7 +363,7 @@ void cpu_put_timer(QEMUFile *f, CPUTimer *s)
qemu_put_be64s(f, &s->disabled_mask);
qemu_put_sbe64s(f, &s->clock_offset);
qemu_put_timer(f, s->qtimer);
timer_put(f, s->qtimer);
}
void cpu_get_timer(QEMUFile *f, CPUTimer *s)
......@@ -373,7 +373,7 @@ void cpu_get_timer(QEMUFile *f, CPUTimer *s)
qemu_get_be64s(f, &s->disabled_mask);
qemu_get_sbe64s(f, &s->clock_offset);
qemu_get_timer(f, s->qtimer);
timer_get(f, s->qtimer);
}
static CPUTimer *cpu_timer_create(const char *name, SPARCCPU *cpu,
......
This diff is collapsed.
......@@ -487,7 +487,7 @@ int main_loop_wait(int nonblocking)
slirp_pollfds_poll(gpollfds, (ret < 0));
#endif
qemu_run_all_timers();
qemu_clock_run_all_timers();
return ret;
}
......
......@@ -132,25 +132,27 @@ static QEMUClock *qemu_clock_new(QEMUClockType type)
return clock;
}
bool qemu_clock_use_for_deadline(QEMUClock *clock)
bool qemu_clock_use_for_deadline(QEMUClockType type)
{
return !(use_icount && (clock->type == QEMU_CLOCK_VIRTUAL));
return !(use_icount && (type == QEMU_CLOCK_VIRTUAL));
}
void qemu_clock_notify(QEMUClock *clock)
void qemu_clock_notify(QEMUClockType type)
{
QEMUTimerList *timer_list;
QEMUClock *clock = qemu_clock_ptr(type);
QLIST_FOREACH(timer_list, &clock->timerlists, list) {
timerlist_notify(timer_list);
}
}
void qemu_clock_enable(QEMUClock *clock, bool enabled)
void qemu_clock_enable(QEMUClockType type, bool enabled)
{
QEMUClock *clock = qemu_clock_ptr(type);
bool old = clock->enabled;
clock->enabled = enabled;
if (enabled && !old) {
qemu_clock_notify(clock);
qemu_clock_notify(type);
}
}
......@@ -159,21 +161,23 @@ bool timerlist_has_timers(QEMUTimerList *timer_list)
return !!timer_list->active_timers;
}
bool qemu_clock_has_timers(QEMUClock *clock)
bool qemu_clock_has_timers(QEMUClockType type)
{
return timerlist_has_timers(clock->main_loop_timerlist);
return timerlist_has_timers(
qemu_clock_ptr(type)->main_loop_timerlist);
}
bool timerlist_expired(QEMUTimerList *timer_list)
{
return (timer_list->active_timers &&
timer_list->active_timers->expire_time <
qemu_get_clock_ns(timer_list->clock));
qemu_clock_get_ns(timer_list->clock->type));
}
bool qemu_clock_expired(QEMUClock *clock)
bool qemu_clock_expired(QEMUClockType type)
{
return timerlist_expired(clock->main_loop_timerlist);
return timerlist_expired(
qemu_clock_ptr(type)->main_loop_timerlist);
}
/*
......@@ -190,7 +194,7 @@ int64_t timerlist_deadline_ns(QEMUTimerList *timer_list)
}
delta = timer_list->active_timers->expire_time -
qemu_get_clock_ns(timer_list->clock);
qemu_clock_get_ns(timer_list->clock->type);
if (delta <= 0) {
return 0;
......@@ -199,20 +203,16 @@ int64_t timerlist_deadline_ns(QEMUTimerList *timer_list)
return delta;
}
int64_t qemu_clock_deadline_ns(QEMUClock *clock)
{
return timerlist_deadline_ns(clock->main_loop_timerlist);
}
/* Calculate the soonest deadline across all timerlists attached
* to the clock. This is used for the icount timeout so we
* ignore whether or not the clock should be used in deadline
* calculations.
*/
int64_t qemu_clock_deadline_ns_all(QEMUClock *clock)
int64_t qemu_clock_deadline_ns_all(QEMUClockType type)
{
int64_t deadline = -1;
QEMUTimerList *timer_list;
QEMUClock *clock = qemu_clock_ptr(type);
QLIST_FOREACH(timer_list, &clock->timerlists, list) {
deadline = qemu_soonest_timeout(deadline,
timerlist_deadline_ns(timer_list));
......@@ -220,14 +220,14 @@ int64_t qemu_clock_deadline_ns_all(QEMUClock *clock)
return deadline;
}
QEMUClock *timerlist_get_clock(QEMUTimerList *timer_list)
QEMUClockType timerlist_get_clock(QEMUTimerList *timer_list)
{
return timer_list->clock;
return timer_list->clock->type;
}
QEMUTimerList *qemu_clock_get_main_loop_timerlist(QEMUClock *clock)
QEMUTimerList *qemu_clock_get_main_loop_timerlist(QEMUClockType type)
{
return clock->main_loop_timerlist;
return qemu_clock_ptr(type)->main_loop_timerlist;
}
void timerlist_notify(QEMUTimerList *timer_list)
......@@ -304,13 +304,13 @@ QEMUTimer *qemu_new_timer(QEMUClock *clock, int scale,
scale, cb, opaque);
}
void qemu_free_timer(QEMUTimer *ts)
void timer_free(QEMUTimer *ts)
{
g_free(ts);
}
/* stop a timer, but do not dealloc it */
void qemu_del_timer(QEMUTimer *ts)
void timer_del(QEMUTimer *ts)
{
QEMUTimer **pt, *t;
......@@ -331,11 +331,11 @@ void qemu_del_timer(QEMUTimer *ts)
/* modify the current timer so that it will be fired when current_time
>= expire_time. The corresponding callback will be called. */
void qemu_mod_timer_ns(QEMUTimer *ts, int64_t expire_time)
void timer_mod_ns(QEMUTimer *ts, int64_t expire_time)
{
QEMUTimer **pt, *t;
qemu_del_timer(ts);
timer_del(ts);
/* add the timer in the sorted list */
/* NOTE: this code must be signal safe because
......@@ -355,14 +355,14 @@ void qemu_mod_timer_ns(QEMUTimer *ts, int64_t expire_time)
/* Rearm if necessary */
if (pt == &ts->timer_list->active_timers) {
/* Interrupt execution to force deadline recalculation. */
qemu_clock_warp(ts->timer_list->clock);
qemu_clock_warp(ts->timer_list->clock->type);
timerlist_notify(ts->timer_list);
}
}
void qemu_mod_timer(QEMUTimer *ts, int64_t expire_time)
void timer_mod(QEMUTimer *ts, int64_t expire_time)
{
qemu_mod_timer_ns(ts, expire_time * ts->scale);
timer_mod_ns(ts, expire_time * ts->scale);
}
bool timer_pending(QEMUTimer *ts)
......@@ -391,7 +391,7 @@ bool timerlist_run_timers(QEMUTimerList *timer_list)
return progress;
}
current_time = qemu_get_clock_ns(timer_list->clock);
current_time = qemu_clock_get_ns(timer_list->clock->type);
for(;;) {
ts = timer_list->active_timers;
if (!timer_expired_ns(ts, current_time)) {
......@@ -408,9 +408,14 @@ bool timerlist_run_timers(QEMUTimerList *timer_list)
return progress;
}
bool qemu_clock_run_timers(QEMUClockType type)
{
return timerlist_run_timers(qemu_clock_ptr(type)->main_loop_timerlist);
}
bool qemu_run_timers(QEMUClock *clock)
{
return timerlist_run_timers(clock->main_loop_timerlist);
return qemu_clock_run_timers(clock->type);
}
void timerlistgroup_init(QEMUTimerListGroup *tlg,
......@@ -445,7 +450,7 @@ int64_t timerlistgroup_deadline_ns(QEMUTimerListGroup *tlg)
int64_t deadline = -1;
QEMUClockType type;
for (type = 0; type < QEMU_CLOCK_MAX; type++) {
if (qemu_clock_use_for_deadline(tlg->tl[type]->clock)) {
if (qemu_clock_use_for_deadline(tlg->tl[type]->clock->type)) {
deadline = qemu_soonest_timeout(deadline,
timerlist_deadline_ns(
tlg->tl[type]));
......@@ -454,11 +459,12 @@ int64_t timerlistgroup_deadline_ns(QEMUTimerListGroup *tlg)
return deadline;
}
int64_t qemu_get_clock_ns(QEMUClock *clock)
int64_t qemu_clock_get_ns(QEMUClockType type)
{
int64_t now, last;
QEMUClock *clock = qemu_clock_ptr(type);
switch(clock->type) {
switch (type) {
case QEMU_CLOCK_REALTIME:
return get_clock();
default:
......@@ -479,16 +485,36 @@ int64_t qemu_get_clock_ns(QEMUClock *clock)
}
}
void qemu_register_clock_reset_notifier(QEMUClock *clock, Notifier *notifier)
int64_t qemu_get_clock_ns(QEMUClock *clock)
{
return qemu_clock_get_ns(clock->type);
}
void qemu_clock_register_reset_notifier(QEMUClockType type,
Notifier *notifier)
{
QEMUClock *clock = qemu_clock_ptr(type);
notifier_list_add(&clock->reset_notifiers, notifier);
}
void qemu_unregister_clock_reset_notifier(QEMUClock *clock, Notifier *notifier)
void qemu_clock_unregister_reset_notifier(QEMUClockType type,
Notifier *notifier)
{
notifier_remove(notifier);
}
void qemu_register_clock_reset_notifier(QEMUClock *clock,
Notifier *notifier)
{
qemu_clock_register_reset_notifier(clock->type, notifier);
}
void qemu_unregister_clock_reset_notifier(QEMUClock *clock,
Notifier *notifier)
{
qemu_clock_unregister_reset_notifier(clock->type, notifier);
}
void init_clocks(void)
{
QEMUClockType type;
......@@ -509,13 +535,13 @@ uint64_t timer_expire_time_ns(QEMUTimer *ts)
return timer_pending(ts) ? ts->expire_time : -1;
}
bool qemu_run_all_timers(void)
bool qemu_clock_run_all_timers(void)
{
bool progress = false;
QEMUClockType type;
for (type = 0; type < QEMU_CLOCK_MAX; type++) {
progress |= qemu_run_timers(qemu_clock_ptr(type));
progress |= qemu_clock_run_timers(type);
}
return progress;
......
......@@ -412,7 +412,7 @@ static void qtest_process_command(CharDriverState *chr, gchar **words)
if (words[1]) {
ns = strtoll(words[1], NULL, 0);
} else {
ns = qemu_clock_deadline_ns_all(vm_clock);
ns = qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL);
}
qtest_clock_warp(qemu_get_clock_ns(vm_clock) + ns);
qtest_send_prefix(chr);
......
......@@ -979,7 +979,7 @@ uint64_t qemu_get_be64(QEMUFile *f)
/* timer */
void qemu_put_timer(QEMUFile *f, QEMUTimer *ts)
void timer_put(QEMUFile *f, QEMUTimer *ts)
{
uint64_t expire_time;
......@@ -987,7 +987,7 @@ void qemu_put_timer(QEMUFile *f, QEMUTimer *ts)
qemu_put_be64(f, expire_time);
}
void qemu_get_timer(QEMUFile *f, QEMUTimer *ts)
void timer_get(QEMUFile *f, QEMUTimer *ts)
{
uint64_t expire_time;
......@@ -1339,14 +1339,14 @@ const VMStateInfo vmstate_info_float64 = {
static int get_timer(QEMUFile *f, void *pv, size_t size)
{
QEMUTimer *v = pv;
qemu_get_timer(f, v);
timer_get(f, v);
return 0;
}
static void put_timer(QEMUFile *f, void *pv, size_t size)
{
QEMUTimer *v = pv;
qemu_put_timer(f, v);
timer_put(f, v);
}
const VMStateInfo vmstate_info_timer = {
......
#include "qemu-common.h"
#include "qemu/timer.h"
void qemu_clock_warp(QEMUClock *clock)
void qemu_clock_warp(QEMUClockType type)
{
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment