[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/18] extract timer handling out of main_loop_wait
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 08/18] extract timer handling out of main_loop_wait |
Date: |
Wed, 10 Mar 2010 11:38:45 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
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
- [Qemu-devel] [PATCH 00/18] extract qemu-timer.c, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 01/18] avoid dubiously clever code in win32_start_timer, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 02/18] fix error in win32_rearm_timer, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 03/18] only one flag is needed for alarm_timer, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 04/18] more alarm timer cleanup, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 05/18] do not use qemu_event_increment outside qemu_notify_event, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 07/18] remove qemu_rearm_alarm_timer from main loop, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 08/18] extract timer handling out of main_loop_wait,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 06/18] tweak qemu_notify_event, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 10/18] introduce and use qemu_clock_enable, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 11/18] centralize handling of -icount, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 09/18] change qemu_run_timers interface, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 13/18] add qemu_alarm_pending, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 12/18] add qemu_icount_round, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 14/18] new function qemu_icount_delta, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 15/18] move vmstate registration of vmstate_timers earlier, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 16/18] place together more #ifdef CONFIG_IOTHREAD blocks, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 17/18] disentangle tcg and deadline calculation, Paolo Bonzini, 2010/03/10