From patchwork Thu Jan 14 13:45:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?B?Wm9sdMOhbiBLxZF2w6Fnw7M=?= X-Patchwork-Id: 567445 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3F479140297 for ; Fri, 15 Jan 2016 00:55:57 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=yk84qu9B; dkim-atps=neutral Received: from localhost ([::1]:42601 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiNX-0008Pn-9s for incoming@patchwork.ozlabs.org; Thu, 14 Jan 2016 08:55:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35663) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiEU-0001VR-Pp for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJiEP-0003TP-Cr for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:34 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:33186) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiEP-0003TK-4U for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:29 -0500 Received: by mail-wm0-x242.google.com with SMTP id u188so43609950wmu.0 for ; Thu, 14 Jan 2016 05:46:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=N01N4vVtSBjqd5p0b3jHGkj/e9lDcpstpWCtSYgWsHg=; b=yk84qu9BD1I3Qk3psuuAzGBCY8frbD3d1HYzKKcx6vnNaBuJtjkI2Of+HR6AYdhg97 o3A4w2EZjSySf1cJK+HrD+R8YcTps3seyaEEbAt1i89ivVixFx2uWXzMxSSGY9iAtXl/ 48hbIrJmMwj7ciHwgbfbR6ZnguVXCvSGQTcXpgyRoCstCKcCP77BHsf8jY2tN/tSM5+j zUFxjwI7jQpWzQyua+RN0hZ0elPl4QRHv+XsvcNnyWbpOn6bpu4cbhvVFQc3w/G9FKKv gzwcm6oT/UsXpyjEgEidX1WhlHANRbfnEKERzwyaKO7xkdlTtQqsPndCZADYkJ2sTEO4 vaDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=N01N4vVtSBjqd5p0b3jHGkj/e9lDcpstpWCtSYgWsHg=; b=cHS4nEtTuBXnXhqBWhywXyBj15UjcsCcrMdyp0aGRF1xbgn/N1Yh50Jmgad0d/BlSk EO1Bo+urFy3kqh8Q89wf8oSIyLHyqhph4dy6DHY5tgU8blJjW1tcKr3PboCQCtBd2+O7 5shx/Rk7REesmUdk/hPDLWplwOaA5OxTtcZtpmtAXQ0dKHF1bcf2WOCZV8ukm+RV6st3 nr9gicXboAnGBS+NJK5ZHuIErzTyVw0qTe1UlXxqfpi0ROT7dJt3LmiwKy/xiiQgAMXN KZ6eCK16BC3vOj88/T84689f9+9sbGul9MqcchUp0eNqaZ+XVMTDd+9DvVXpDoeyJtPA SfZg== X-Gm-Message-State: ALoCoQlXCjD7Bi6r5tlTNxouTdSmbkHldUmrQCq1rANuz6L5kDbcdL9um1ZM/9FOXsdrvCkDlBTMzd6YaeSBS55PtROy28Tm6A== X-Received: by 10.194.158.73 with SMTP id ws9mr4907107wjb.40.1452779188637; Thu, 14 Jan 2016 05:46:28 -0800 (PST) Received: from nullptr.home.dirty-ice.org (188-143-126-18.pool.digikabel.hu. [188.143.126.18]) by smtp.gmail.com with ESMTPSA id 79sm7398061wmo.7.2016.01.14.05.46.27 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Jan 2016 05:46:28 -0800 (PST) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= To: qemu-devel@nongnu.org Date: Thu, 14 Jan 2016 14:45:37 +0100 Message-Id: X-Mailer: git-send-email 2.7.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::242 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 24/51] audio: do not run each backend in audio_run X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org audio_run is called manually by alsa and oss backends when polling. In this case only the requesting backend should be run, not all of them. Reviewed-by: Marc-André Lureau Signed-off-by: Kővágó, Zoltán --- audio/alsaaudio.c | 7 +++++-- audio/audio.c | 17 +++++++---------- audio/audio_int.h | 2 +- audio/ossaudio.c | 12 ++++++------ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c index e2ad3ba..dcc2a09 100644 --- a/audio/alsaaudio.c +++ b/audio/alsaaudio.c @@ -40,6 +40,7 @@ struct pollhlp { struct pollfd *pfds; int count; int mask; + AudioState *s; }; typedef struct ALSAVoiceOut { @@ -200,11 +201,11 @@ static void alsa_poll_handler (void *opaque) break; case SND_PCM_STATE_PREPARED: - audio_run ("alsa run (prepared)"); + audio_run(hlp->s, "alsa run (prepared)"); break; case SND_PCM_STATE_RUNNING: - audio_run ("alsa run (running)"); + audio_run (hlp->s, "alsa run (running)"); break; default: @@ -758,6 +759,7 @@ static int alsa_init_out(HWVoiceOut *hw, struct audsettings *as, return -1; } + alsa->pollhlp.s = hw->s; alsa->handle = handle; alsa->dev = dev; return 0; @@ -859,6 +861,7 @@ static int alsa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) return -1; } + alsa->pollhlp.s = hw->s; alsa->handle = handle; alsa->dev = dev; return 0; diff --git a/audio/audio.c b/audio/audio.c index f469db8..6cafe87 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -790,8 +790,9 @@ static void audio_reset_timer (AudioState *s) static void audio_timer (void *opaque) { - audio_run ("timer"); - audio_reset_timer (opaque); + AudioState *s = opaque; + audio_run(s, "timer"); + audio_reset_timer(s); } /* @@ -1194,15 +1195,11 @@ static void audio_run_capture (AudioState *s) } } -void audio_run (const char *msg) +void audio_run(AudioState *s, const char *msg) { - AudioState *s; - - QTAILQ_FOREACH(s, &audio_states, list) { - audio_run_out (s); - audio_run_in (s); - audio_run_capture (s); - } + audio_run_out(s); + audio_run_in(s); + audio_run_capture(s); #ifdef DEBUG_POLL { diff --git a/audio/audio_int.h b/audio/audio_int.h index 1d81658..c52c656 100644 --- a/audio/audio_int.h +++ b/audio/audio_int.h @@ -220,7 +220,7 @@ int audio_pcm_hw_clip_out (HWVoiceOut *hw, void *pcm_buf, int audio_bug (const char *funcname, int cond); void *audio_calloc (const char *funcname, int nmemb, size_t size); -void audio_run (const char *msg); +void audio_run(AudioState *s, const char *msg); #define VOICE_ENABLE 1 #define VOICE_DISABLE 2 diff --git a/audio/ossaudio.c b/audio/ossaudio.c index 7bc76c0..ae4c452 100644 --- a/audio/ossaudio.c +++ b/audio/ossaudio.c @@ -112,28 +112,28 @@ static void oss_anal_close (int *fdp) static void oss_helper_poll_out (void *opaque) { - (void) opaque; - audio_run ("oss_poll_out"); + AudioState *s = opaque; + audio_run(s, "oss_poll_out"); } static void oss_helper_poll_in (void *opaque) { - (void) opaque; - audio_run ("oss_poll_in"); + AudioState *s = opaque; + audio_run(s, "oss_poll_in"); } static void oss_poll_out (HWVoiceOut *hw) { OSSVoiceOut *oss = (OSSVoiceOut *) hw; - qemu_set_fd_handler (oss->fd, NULL, oss_helper_poll_out, NULL); + qemu_set_fd_handler(oss->fd, NULL, oss_helper_poll_out, hw->s); } static void oss_poll_in (HWVoiceIn *hw) { OSSVoiceIn *oss = (OSSVoiceIn *) hw; - qemu_set_fd_handler (oss->fd, oss_helper_poll_in, NULL, NULL); + qemu_set_fd_handler(oss->fd, oss_helper_poll_in, NULL, hw->s); } static int oss_write (SWVoiceOut *sw, void *buf, int len)