From patchwork Mon Dec 21 08:09:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 41530 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 A4094B6F16 for ; Mon, 21 Dec 2009 19:56:44 +1100 (EST) Received: from localhost ([127.0.0.1]:55579 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NMe4G-0001Y2-7R for incoming@patchwork.ozlabs.org; Mon, 21 Dec 2009 03:56:40 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NMdKw-0002mK-Ho for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:52 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NMdKm-0002hP-KH for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:47 -0500 Received: from [199.232.76.173] (port=52815 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NMdKl-0002gx-9i for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:6493) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NMdKk-0003oK-OR for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:39 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBL89bZr016510 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 21 Dec 2009 03:09:38 -0500 Received: from localhost.localdomain (vpn2-10-119.ams2.redhat.com [10.36.10.119]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBL89V3Q011460 for ; Mon, 21 Dec 2009 03:09:37 -0500 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 21 Dec 2009 09:09:17 +0100 Message-Id: <1261382970-23251-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1261382970-23251-1-git-send-email-pbonzini@redhat.com> References: <1261382970-23251-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 06/19] more alarm timer cleanup 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 The timer_alarm_pending variable is related to the alarm timer but not placed in the struct. Also, in qemu_mod_timer the wrong flag was being tested: the timer is rearmed in the alarm timer "bottom half", so the right flag to test there is the "pending" flag. Finally, I hoisted the NULL checks from alarm_has_dynticks to host_alarm_handler. Signed-off-by: Paolo Bonzini --- vl.c | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/vl.c b/vl.c index efffaf1..1af2f81 100644 --- a/vl.c +++ b/vl.c @@ -253,7 +253,6 @@ uint64_t node_cpumask[MAX_NODES]; static CPUState *cur_cpu; static CPUState *next_cpu; -static int timer_alarm_pending = 1; /* Conversion factor from emulated instructions to virtual clock ticks. */ static int icount_time_shift; /* Arbitrarily pick 1MIPS as the minimum allowable speed. */ @@ -784,12 +783,13 @@ struct qemu_alarm_timer { void (*rearm)(struct qemu_alarm_timer *t); void *priv; - unsigned int expired; + char expired; + char pending; }; static inline int alarm_has_dynticks(struct qemu_alarm_timer *t) { - return t && t->rearm; + return !!t->rearm; } static void qemu_rearm_alarm_timer(struct qemu_alarm_timer *t) @@ -1084,7 +1084,7 @@ void qemu_mod_timer(QEMUTimer *ts, int64_t expire_time) /* Rearm if necessary */ if (pt == &active_timers[ts->clock->type]) { - if (!alarm_timer->expired) { + if (!alarm_timer->pending) { qemu_rearm_alarm_timer(alarm_timer); } /* Interrupt execution to force deadline recalculation. */ @@ -1202,6 +1202,10 @@ static void CALLBACK host_alarm_handler(UINT uTimerID, UINT uMsg, static void host_alarm_handler(int host_signum) #endif { + struct qemu_alarm_timer *t = alarm_timer; + if (!t) + return; + #if 0 #define DISP_FREQ 1000 { @@ -1231,7 +1235,7 @@ static void host_alarm_handler(int host_signum) last_clock = ti; } #endif - if (alarm_has_dynticks(alarm_timer) || + if (alarm_has_dynticks(t) || (!use_icount && qemu_timer_expired(active_timers[QEMU_CLOCK_VIRTUAL], qemu_get_clock(vm_clock))) || @@ -1240,7 +1244,7 @@ static void host_alarm_handler(int host_signum) qemu_timer_expired(active_timers[QEMU_CLOCK_HOST], qemu_get_clock(host_clock))) { qemu_event_increment(); - if (alarm_timer) alarm_timer->expired = 1; + t->expired = alarm_has_dynticks(t); #ifndef CONFIG_IOTHREAD if (next_cpu) { @@ -1248,7 +1252,7 @@ static void host_alarm_handler(int host_signum) cpu_exit(next_cpu); } #endif - timer_alarm_pending = 1; + t->pending = 1; qemu_notify_event(); } } @@ -1628,6 +1632,8 @@ static int init_timer_alarm(void) goto fail; } + /* first event is at time 0 */ + t->pending = 1; alarm_timer = t; return 0; @@ -1638,8 +1644,9 @@ fail: static void quit_timers(void) { - alarm_timer->stop(alarm_timer); + struct qemu_alarm_timer *t = alarm_timer; alarm_timer = NULL; + t->stop(t); } /***********************************************************/ @@ -3997,6 +4004,8 @@ void main_loop_wait(int timeout) qemu_rearm_alarm_timer(alarm_timer); } + alarm_timer->pending = 0; + /* vm time timers */ if (vm_running) { if (!cur_cpu || likely(!(cur_cpu->singlestep_enabled & SSTEP_NOTIMER))) @@ -4066,10 +4075,8 @@ static void tcg_cpu_exec(void) if (!vm_running) break; - if (timer_alarm_pending) { - timer_alarm_pending = 0; + if (alarm_timer->pending) break; - } if (cpu_can_run(env)) ret = qemu_cpu_exec(env); if (ret == EXCP_DEBUG) {