From patchwork Sat Mar 12 17:04:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 86550 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 52791B6F14 for ; Sun, 13 Mar 2011 04:28:10 +1100 (EST) Received: from localhost ([127.0.0.1]:42487 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PySbn-0000bl-FW for incoming@patchwork.ozlabs.org; Sat, 12 Mar 2011 12:28:07 -0500 Received: from [140.186.70.92] (port=37769 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PySF0-0006QD-Of for qemu-devel@nongnu.org; Sat, 12 Mar 2011 12:04:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PySEy-0000wb-K9 for qemu-devel@nongnu.org; Sat, 12 Mar 2011 12:04:34 -0500 Received: from mail-ww0-f53.google.com ([74.125.82.53]:52092) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PySEy-0000uO-Dw for qemu-devel@nongnu.org; Sat, 12 Mar 2011 12:04:32 -0500 Received: by mail-ww0-f53.google.com with SMTP id 40so4603790wwj.10 for ; Sat, 12 Mar 2011 09:04:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=a4Fs4inL0mK2X3+rBPBw+gLZ5jZEI25pXlPCOuCG8mo=; b=hnuOVyML32Hnu3yQxlA6z1Oqxc1+Opjk8UJNydLq/I2939SEMqNg0cT8DgCROpxg/+ a9fe1JO81yxSaJS3H1Y2UFMTNM/7K6/Lq1Pfqd6gUS7KRCLuFtvLhQOcYIyS9yw9X92T s76wg8Q4PKf/VNOPM8lRU2JMShxLV88RvLf94= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=G2BACCBt2SY3bVCQGMmF+VufkR7z9pU7XbOnbAt8r4TMitAdS1BGZnSAk7vFuO1FL3 0NFPPKVajnupVKYucGRsWIf9c+ReNrK7NMKKVAwmaWEJ2SdKM6Qqy2uHFrr5jFxUaPTR hf8Y0D7WW3UevNWJpAzxTEakE0g2N5YGCPwgI= Received: by 10.227.136.204 with SMTP id s12mr9513548wbt.15.1299949471961; Sat, 12 Mar 2011 09:04:31 -0800 (PST) Received: from localhost.localdomain (93-34-197-200.ip51.fastwebnet.it [93.34.197.200]) by mx.google.com with ESMTPS id x1sm4467808wbh.8.2011.03.12.09.04.30 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 12 Mar 2011 09:04:31 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 12 Mar 2011 18:04:19 +0100 Message-Id: <1299949460-4387-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1299949460-4387-1-git-send-email-pbonzini@redhat.com> References: <1299949460-4387-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.53 Subject: [Qemu-devel] [RFC PATCH 4/5] add a generic scaling mechanism for timers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This enables rt_clock timers to use nanosecond resolution, just by using the _ns functions; there is really no reason to forbid that. Migrated timers are all using vm_clock (of course; but I checked that anyway) so the timers in the savevm files are already in nanosecond resolution. So this patch makes no change to the migration format. Signed-off-by: Paolo Bonzini --- qemu-timer.c | 25 +++++++++++++++++-------- qemu-timer.h | 9 ++++----- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/qemu-timer.c b/qemu-timer.c index f171e9c..1aed535 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -153,12 +153,12 @@ void cpu_disable_ticks(void) struct QEMUClock { int type; int enabled; - /* XXX: add frequency */ }; struct QEMUTimer { QEMUClock *clock; - int64_t expire_time; + int64_t expire_time; /* in nanoseconds */ + int scale; QEMUTimerCB *cb; void *opaque; struct QEMUTimer *next; @@ -391,7 +391,8 @@ void qemu_clock_enable(QEMUClock *clock, int enabled) clock->enabled = enabled; } -QEMUTimer *qemu_new_timer(QEMUClock *clock, QEMUTimerCB *cb, void *opaque) +QEMUTimer *qemu_new_timer(QEMUClock *clock, int scale, + QEMUTimerCB *cb, void *opaque) { QEMUTimer *ts; @@ -399,6 +400,7 @@ QEMUTimer *qemu_new_timer(QEMUClock *clock, QEMUTimerCB *cb, void *opaque) ts->clock = clock; ts->cb = cb; ts->opaque = opaque; + ts->scale = scale; return ts; } @@ -429,7 +431,7 @@ 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(QEMUTimer *ts, int64_t expire_time) +static void qemu_mod_timer_ns(QEMUTimer *ts, int64_t expire_time) { QEMUTimer **pt, *t; @@ -462,6 +464,13 @@ void qemu_mod_timer(QEMUTimer *ts, int64_t expire_time) } } +/* 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(QEMUTimer *ts, int64_t expire_time) +{ + qemu_mod_timer_ns(ts, expire_time * ts->scale); +} + int qemu_timer_pending(QEMUTimer *ts) { QEMUTimer *t; @@ -476,7 +485,7 @@ int qemu_timer_expired(QEMUTimer *timer_head, int64_t current_time) { if (!timer_head) return 0; - return (timer_head->expire_time <= current_time); + return (timer_head->expire_time <= current_time * timer_head->scale); } static void qemu_run_timers(QEMUClock *clock) @@ -487,7 +496,7 @@ static void qemu_run_timers(QEMUClock *clock) if (!clock->enabled) return; - current_time = qemu_get_clock (clock); + current_time = qemu_get_clock_ns(clock); ptimer_head = &active_timers[clock->type]; for(;;) { ts = *ptimer_head; @@ -564,7 +573,7 @@ void qemu_get_timer(QEMUFile *f, QEMUTimer *ts) expire_time = qemu_get_be64(f); if (expire_time != -1) { - qemu_mod_timer(ts, expire_time); + qemu_mod_timer_ns(ts, expire_time); } else { qemu_del_timer(ts); } @@ -724,7 +733,7 @@ static int64_t qemu_next_alarm_deadline(void) delta = hdelta; } if (active_timers[QEMU_CLOCK_REALTIME]) { - rtdelta = (active_timers[QEMU_CLOCK_REALTIME]->expire_time * 1000000 - + rtdelta = (active_timers[QEMU_CLOCK_REALTIME]->expire_time - qemu_get_clock_ns(rt_clock)); if (rtdelta < delta) delta = rtdelta; diff --git a/qemu-timer.h b/qemu-timer.h index 345feea..0ea77fb 100644 --- a/qemu-timer.h +++ b/qemu-timer.h @@ -41,7 +41,8 @@ int64_t qemu_get_clock(QEMUClock *clock); int64_t qemu_get_clock_ns(QEMUClock *clock); void qemu_clock_enable(QEMUClock *clock, int enabled); -QEMUTimer *qemu_new_timer(QEMUClock *clock, QEMUTimerCB *cb, void *opaque); +QEMUTimer *qemu_new_timer(QEMUClock *clock, int scale, + QEMUTimerCB *cb, void *opaque); void qemu_free_timer(QEMUTimer *ts); void qemu_del_timer(QEMUTimer *ts); void qemu_mod_timer(QEMUTimer *ts, int64_t expire_time); @@ -61,15 +62,13 @@ void quit_timers(void); static inline QEMUTimer *qemu_new_timer_ns(QEMUClock *clock, QEMUTimerCB *cb, void *opaque) { - assert(clock != rt_clock); - return qemu_new_timer(clock, cb, opaque); + return qemu_new_timer(clock, SCALE_NS, cb, opaque); } static inline QEMUTimer *qemu_new_timer_ms(QEMUClock *clock, QEMUTimerCB *cb, void *opaque) { - assert(clock == rt_clock); - return qemu_new_timer(clock, cb, opaque); + return qemu_new_timer(clock, SCALE_MS, cb, opaque); } static inline int64_t qemu_get_clock_ms(QEMUClock *clock)