|
 |
acbc4a |
From 6b7ac46a461482c06c5ccdf54815e94205bc7d95 Mon Sep 17 00:00:00 2001
|
|
|
acbc4a |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
acbc4a |
Date: Wed, 9 Oct 2013 21:33:44 +0200
|
|
|
acbc4a |
Subject: [PATCH] audio: honor QEMU_AUDIO_TIMER_PERIOD instead of waking up
|
|
|
acbc4a |
every *nano* second
|
|
|
acbc4a |
|
|
|
acbc4a |
Now that we no longer have MIN_REARM_TIMER_NS a bug in the audio subsys has
|
|
|
acbc4a |
clearly shown it self by trying to make a timer fire every nano second.
|
|
|
acbc4a |
|
|
|
acbc4a |
Note we have a similar problem in 1.6, 1.5 and older but there
|
|
|
acbc4a |
MIN_REARM_TIMER_NS limits the wakeups caused by audio being active to
|
|
|
acbc4a |
4000 times / second. This still causes a host cpu load of 50 % for simply
|
|
|
acbc4a |
playing audio, where as with this patch git master is at 13%, so we should
|
|
|
acbc4a |
backport this to 1.5 and 1.6 too.
|
|
|
acbc4a |
|
|
|
acbc4a |
Note this will not apply to 1.5 and 1.6 as is.
|
|
|
acbc4a |
|
|
|
acbc4a |
Cc: qemu-stable@nongnu.org
|
|
|
acbc4a |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
acbc4a |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
acbc4a |
(cherry picked from commit b4350deed67b95651896ddb60cf9f765093a4848)
|
|
|
acbc4a |
|
|
|
acbc4a |
Conflicts:
|
|
|
acbc4a |
audio/audio.c
|
|
|
acbc4a |
---
|
|
|
acbc4a |
audio/audio.c | 3 ++-
|
|
|
acbc4a |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
acbc4a |
|
|
|
acbc4a |
diff --git a/audio/audio.c b/audio/audio.c
|
|
|
acbc4a |
index 02bb886..f9b3e95 100644
|
|
|
acbc4a |
--- a/audio/audio.c
|
|
|
acbc4a |
+++ b/audio/audio.c
|
|
|
acbc4a |
@@ -1124,7 +1124,8 @@ static int audio_is_timer_needed (void)
|
|
|
acbc4a |
static void audio_reset_timer (AudioState *s)
|
|
|
acbc4a |
{
|
|
|
acbc4a |
if (audio_is_timer_needed ()) {
|
|
|
acbc4a |
- qemu_mod_timer (s->ts, qemu_get_clock_ns (vm_clock) + 1);
|
|
|
acbc4a |
+ qemu_mod_timer (s->ts,
|
|
|
acbc4a |
+ qemu_get_clock_ns (vm_clock) + conf.period.ticks);
|
|
|
acbc4a |
}
|
|
|
acbc4a |
else {
|
|
|
acbc4a |
qemu_del_timer (s->ts);
|