| Message ID | 1318332930-16217-5-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 10/11/2011 06:35 AM, Paolo Bonzini wrote: > These will be used when moving icount accounting to cpus.c. > > Signed-off-by: Paolo Bonzini<pbonzini@redhat.com> Reviewed-by: Anthony Liguori <Aliguori@us.ibm.com> Regards, Anthony Liguori > --- > qemu-timer.c | 25 +++++++++++++++++++++++++ > qemu-timer.h | 3 +++ > 2 files changed, 28 insertions(+), 0 deletions(-) > > diff --git a/qemu-timer.c b/qemu-timer.c > index e2551f3..ebb5089 100644 > --- a/qemu-timer.c > +++ b/qemu-timer.c > @@ -495,6 +495,31 @@ void qemu_clock_warp(QEMUClock *clock) > } > } > > +int64_t qemu_clock_has_timers(QEMUClock *clock) > +{ > + return !!clock->active_timers; > +} > + > +int64_t qemu_clock_expired(QEMUClock *clock) > +{ > + return (clock->active_timers&& > + clock->active_timers->expire_time< qemu_get_clock_ns(clock)); > +} > + > +int64_t qemu_clock_deadline(QEMUClock *clock) > +{ > + /* To avoid problems with overflow limit this to 2^32. */ > + int64_t delta = INT32_MAX; > + > + if (clock->active_timers) { > + delta = clock->active_timers->expire_time - qemu_get_clock_ns(clock); > + } > + if (delta< 0) { > + delta = 0; > + } > + return delta; > +} > + > QEMUTimer *qemu_new_timer(QEMUClock *clock, int scale, > QEMUTimerCB *cb, void *opaque) > { > diff --git a/qemu-timer.h b/qemu-timer.h > index 0a43469..4578075 100644 > --- a/qemu-timer.h > +++ b/qemu-timer.h > @@ -38,6 +38,9 @@ extern QEMUClock *vm_clock; > extern QEMUClock *host_clock; > > int64_t qemu_get_clock_ns(QEMUClock *clock); > +int64_t qemu_clock_has_timers(QEMUClock *clock); > +int64_t qemu_clock_expired(QEMUClock *clock); > +int64_t qemu_clock_deadline(QEMUClock *clock); > void qemu_clock_enable(QEMUClock *clock, int enabled); > void qemu_clock_warp(QEMUClock *clock); >
diff --git a/qemu-timer.c b/qemu-timer.c index e2551f3..ebb5089 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -495,6 +495,31 @@ void qemu_clock_warp(QEMUClock *clock) } } +int64_t qemu_clock_has_timers(QEMUClock *clock) +{ + return !!clock->active_timers; +} + +int64_t qemu_clock_expired(QEMUClock *clock) +{ + return (clock->active_timers && + clock->active_timers->expire_time < qemu_get_clock_ns(clock)); +} + +int64_t qemu_clock_deadline(QEMUClock *clock) +{ + /* To avoid problems with overflow limit this to 2^32. */ + int64_t delta = INT32_MAX; + + if (clock->active_timers) { + delta = clock->active_timers->expire_time - qemu_get_clock_ns(clock); + } + if (delta < 0) { + delta = 0; + } + return delta; +} + QEMUTimer *qemu_new_timer(QEMUClock *clock, int scale, QEMUTimerCB *cb, void *opaque) { diff --git a/qemu-timer.h b/qemu-timer.h index 0a43469..4578075 100644 --- a/qemu-timer.h +++ b/qemu-timer.h @@ -38,6 +38,9 @@ extern QEMUClock *vm_clock; extern QEMUClock *host_clock; int64_t qemu_get_clock_ns(QEMUClock *clock); +int64_t qemu_clock_has_timers(QEMUClock *clock); +int64_t qemu_clock_expired(QEMUClock *clock); +int64_t qemu_clock_deadline(QEMUClock *clock); void qemu_clock_enable(QEMUClock *clock, int enabled); void qemu_clock_warp(QEMUClock *clock);
These will be used when moving icount accounting to cpus.c. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- qemu-timer.c | 25 +++++++++++++++++++++++++ qemu-timer.h | 3 +++ 2 files changed, 28 insertions(+), 0 deletions(-)