From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:60924) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDacf-00070v-UI for qemu-devel@nongnu.org; Tue, 11 Oct 2011 07:35:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RDaca-0005P2-Uj for qemu-devel@nongnu.org; Tue, 11 Oct 2011 07:35:49 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:60298) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDaca-0005O0-Ng for qemu-devel@nongnu.org; Tue, 11 Oct 2011 07:35:44 -0400 Received: by mail-ww0-f53.google.com with SMTP id 14so8836630wwg.10 for ; Tue, 11 Oct 2011 04:35:44 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 11 Oct 2011 13:35:21 +0200 Message-Id: <1318332930-16217-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1318332930-16217-1-git-send-email-pbonzini@redhat.com> References: <1318332930-16217-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 04/13] qemu-timer: more clock functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org These will be used when moving icount accounting to cpus.c. Signed-off-by: Paolo Bonzini --- 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); -- 1.7.6