From patchwork Wed Jan 16 23:36:55 2019 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: 1026297 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EdnV/VPp"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43g3m86xSQz9sBn for ; Thu, 17 Jan 2019 10:47:36 +1100 (AEDT) Received: from localhost ([127.0.0.1]:33547 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjuuE-0003KE-RP for incoming@patchwork.ozlabs.org; Wed, 16 Jan 2019 18:47:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57996) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjuks-00046u-44 for qemu-devel@nongnu.org; Wed, 16 Jan 2019 18:37:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjukm-00031c-Je for qemu-devel@nongnu.org; Wed, 16 Jan 2019 18:37:52 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:43010) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gjukm-0002vJ-3C for qemu-devel@nongnu.org; Wed, 16 Jan 2019 18:37:48 -0500 Received: by mail-wr1-x443.google.com with SMTP id r10so8917008wrs.10 for ; Wed, 16 Jan 2019 15:37:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dFjyW9xM6m5+B/PcJyW3Y9EtG64ZLK+f0jcci6rvY0s=; b=EdnV/VPpIMmML0Z0/oUYMtMzVNqkcMiOgKdD5gXSwuCkBb2pcjj6WROF9YUF7vY6LQ u5ZBjrODtLlpoiDJ5h4D30Vo8pGo7FbInRbJc0JLyUAZcjfY84QRoZAxqFbxH9VqPudx Q23apbs7rvpXC45D30OQRbqAxxyLnJgHQRZCkxIfcAGKYbhjnWokw1X/jmqcYZ8klp1x ylmwzYKIPPP6+zVnXNPY50FhD2qHeVIKOzyE8DzZXrjNwicmOO+/EQop+8jpY+fskxYx fzUUDhSrR7NCT2JNbLSFWTTMu4FYIoLUjdR6gDeSF7R+eXtfInEiUY5zuIdWs8X95n6R FuHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dFjyW9xM6m5+B/PcJyW3Y9EtG64ZLK+f0jcci6rvY0s=; b=Ge5V1r+YmacVnGYnVXUZwg2sbON7xpB7ey81Q0XEQBILVkcvl46i9s8TxmjUUL8djd kPa8qYG7NDZ9irFzeX+32lAa97XUqQLRFx+dIAGA4hoUyHhbs0r9kOL1GXWtQOrkIwkh zHYnG9zxTdEyXk1hlP7o9w0kEco3rI4Ivm92s/N24sxTVS2f/qGwtLLlpM1ULASkF+DN B/dqkDOdGRiCjuaWJiNE4CBsybW88W9relBKLmjied8UYfZ1ZapPh5gr2+Cb505p6qeJ wTgiQfM8Nj2Xa1N2gvJNidjC/9Dmb/6BA/fFHNhcLopvT7zjra3sOLJ3ORgr8zK8+OFL KImw== X-Gm-Message-State: AJcUukenT5cUHPwLQi1e5NGae0/MzBOzWF2dmAiry5VBdN2K0FNy79iw KkaLI4W8kyWYgqIsbqhSm8SqQPq7luY= X-Google-Smtp-Source: ALg8bN6rynA7yJtRqlMbaJ+GqH0Mh4+nvAcs9td/I4J54aSYmiUOj0NqZr4jKkhpwKVJeo1TjjEGYA== X-Received: by 2002:adf:b102:: with SMTP id l2mr9191288wra.296.1547681865528; Wed, 16 Jan 2019 15:37:45 -0800 (PST) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-e4b0-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:e4b0::5]) by smtp.gmail.com with ESMTPSA id s66sm30760437wmf.34.2019.01.16.15.37.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 15:37:45 -0800 (PST) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?utf-8?b?S8WRdsOhZ8OzLCBab2x0w6Fu?= To: qemu-devel@nongnu.org Date: Thu, 17 Jan 2019 00:36:55 +0100 Message-Id: <9b2249817b15dc0d3e8772e01385c9973fe9b14c.1547681517.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH v3 22/50] audio: do not run each backend in audio_run X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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. Signed-off-by: Kővágó, Zoltán --- audio/audio_int.h | 2 +- audio/alsaaudio.c | 7 +++++-- audio/audio.c | 14 +++++--------- audio/ossaudio.c | 12 ++++++------ 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/audio/audio_int.h b/audio/audio_int.h index 5ceea76eda..02ec6ea738 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/alsaaudio.c b/audio/alsaaudio.c index c68bd6bf8a..9dfd5fd26f 100644 --- a/audio/alsaaudio.c +++ b/audio/alsaaudio.c @@ -38,6 +38,7 @@ struct pollhlp { struct pollfd *pfds; int count; int mask; + AudioState *s; }; typedef struct ALSAVoiceOut { @@ -198,11 +199,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: @@ -756,6 +757,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; @@ -857,6 +859,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 5f809d13f4..4d0d316ce3 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -838,7 +838,7 @@ static void audio_timer (void *opaque) } s->timer_last = now; - audio_run("timer"); + audio_run(s, "timer"); audio_reset_timer(s); } @@ -1240,15 +1240,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/ossaudio.c b/audio/ossaudio.c index b6ab3e83ef..bbcc44129d 100644 --- a/audio/ossaudio.c +++ b/audio/ossaudio.c @@ -109,28 +109,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)