From patchwork Wed Mar 10 10:38:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 47235 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 177FFB7D00 for ; Wed, 10 Mar 2010 22:14:51 +1100 (EST) Received: from localhost ([127.0.0.1]:42712 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpJsF-00021c-Gs for incoming@patchwork.ozlabs.org; Wed, 10 Mar 2010 06:14:47 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NpJJm-0008H9-BI for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:10 -0500 Received: from [199.232.76.173] (port=52777 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpJJk-0008Fj-8F for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:08 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NpJJj-0004tp-F8 for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:07 -0500 Received: from mail-ew0-f225.google.com ([209.85.219.225]:44410) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NpJJi-0004sQ-QD for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:07 -0500 Received: by mail-ew0-f225.google.com with SMTP id 25so153299ewy.16 for ; Wed, 10 Mar 2010 02:39:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:subject:date :message-id:x-mailer:in-reply-to:references; bh=ZLUPqyjkJlGPJWEmVwliaIZhuhjgOzXhbIV+KbJPTnc=; b=gBshD9d41nvaMwmu4K2mva5/vp7rZ6PE9Xe6KETLgXbFjzlRGELi3boyRtz83yHTdE lqpYTSh7J0Db8b1g5+0QnZrlrQSqHDWkZEZDVZH7t7zZvtqOLaDAlW0um4ocMuRa2wpd YeuosJOFwQU6ssV1P3iVwJRb5I0Hj4FC7fkYA= 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=YC14nqrv2vVOqxkpIp2UavBibjCCDcH5PlPvJ2OyyzuePsccf3+TsXWb41lNRsz2me 1ry9hQ5dLQ0my/5/PvKGZHjz1FSWCVyTkoShkx0pwW5m6QNBt0n7vPWNPMhax2Vw6owd OjJ6etjXBS+Ubu1yGDUv08qc9m+H3e1U6CSAI= Received: by 10.213.109.208 with SMTP id k16mr800981ebp.15.1268217546296; Wed, 10 Mar 2010 02:39:06 -0800 (PST) Received: from localhost.localdomain (nat-pool-brq-t.redhat.com [209.132.186.34]) by mx.google.com with ESMTPS id 14sm3836002ewy.2.2010.03.10.02.39.05 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 10 Mar 2010 02:39:06 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 10 Mar 2010 11:38:45 +0100 Message-Id: <1268217535-26554-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1268217535-26554-1-git-send-email-pbonzini@redhat.com> References: <1268217535-26554-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 08/18] extract timer handling out of main_loop_wait 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 Signed-off-by: Paolo Bonzini --- vl.c | 47 +++++++++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 22 deletions(-) diff --git a/vl.c b/vl.c index d6bbdbe..3347ba0 100644 --- a/vl.c +++ b/vl.c @@ -1002,7 +1002,30 @@ static const VMStateDescription vmstate_timers = { } }; -static void qemu_event_increment(void); +static void qemu_run_all_timers(void) +{ + /* rearm timer, if not periodic */ + if (alarm_timer->expired) { + alarm_timer->expired = 0; + 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))) + qemu_run_timers(&active_timers[QEMU_CLOCK_VIRTUAL], + qemu_get_clock(vm_clock)); + } + + /* real time timers */ + qemu_run_timers(&active_timers[QEMU_CLOCK_REALTIME], + qemu_get_clock(rt_clock)); + + qemu_run_timers(&active_timers[QEMU_CLOCK_HOST], + qemu_get_clock(host_clock)); +} #ifdef _WIN32 static void CALLBACK host_alarm_handler(UINT uTimerID, UINT uMsg, @@ -3892,27 +3915,7 @@ void main_loop_wait(int timeout) slirp_select_poll(&rfds, &wfds, &xfds, (ret < 0)); - /* rearm timer, if not periodic */ - if (alarm_timer->expired) { - alarm_timer->expired = 0; - 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))) - qemu_run_timers(&active_timers[QEMU_CLOCK_VIRTUAL], - qemu_get_clock(vm_clock)); - } - - /* real time timers */ - qemu_run_timers(&active_timers[QEMU_CLOCK_REALTIME], - qemu_get_clock(rt_clock)); - - qemu_run_timers(&active_timers[QEMU_CLOCK_HOST], - qemu_get_clock(host_clock)); + qemu_run_all_timers(); /* Check bottom-halves last in case any of the earlier events triggered them. */