From mboxrd@z Thu Jan 1 00:00:00 1970 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) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 10 Mar 2010 11:38:45 +0100 Message-Id: <1268217535-26554-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1268217535-26554-1-git-send-email-pbonzini@redhat.com> References: <1268217535-26554-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 08/18] extract timer handling out of main_loop_wait List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@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. */ -- 1.6.6