From patchwork Tue Jul 9 18:35:48 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: 1129944 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="WKdPifec"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45jrwc0bbFz9sBt for ; Wed, 10 Jul 2019 04:50:08 +1000 (AEST) Received: from localhost ([::1]:52808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkvBl-0002Bi-Db for incoming@patchwork.ozlabs.org; Tue, 09 Jul 2019 14:50:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36779) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkuyL-0004Ax-4k for qemu-devel@nongnu.org; Tue, 09 Jul 2019 14:36:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkuyJ-0003d0-J0 for qemu-devel@nongnu.org; Tue, 09 Jul 2019 14:36:13 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:35589) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkuyH-0003WT-H3 for qemu-devel@nongnu.org; Tue, 09 Jul 2019 14:36:09 -0400 Received: by mail-wr1-x441.google.com with SMTP id y4so13518061wrm.2 for ; Tue, 09 Jul 2019 11:36:00 -0700 (PDT) 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=LmbJOug2zkbiWUjvNY0y6Ru4b5pRTaqtC9D/nisqBi4=; b=WKdPifecwRx/IoSRh39vj45gzZk+9MrpL5j58ITu+wh6CKi4QrFc0iXEmpUGpoWCC8 RU/3d+pBCjSLDYZHFk4bqRt22paIC4o3LJxUrMddpf7goOehcJBgb/y9eaYXitaRLvou AH2GERIv1HK2Dy2MAWiSKODjXsuTRIzRdXFoqjsSsENZvksIfGUXkuKu67/GHs04zN7N bqPrtQzZ42kaBQ6Q9T91EvY1Yck15w4yb030cbtZgROUGl879lMmmAQdQckJHu/Cihph 6VECvhoNZCUcxEvJWcWEB+wvzCpBdoU8FedXuPFcDTdGaksYSfsfVQtDZDxNmVnB7ZFW wrgA== 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=LmbJOug2zkbiWUjvNY0y6Ru4b5pRTaqtC9D/nisqBi4=; b=qsORqlR+lwPquQTy/5M7m9nK9h4bS8Mqru27Sk10LyX8/ziqir3DiEY4yiukrAN36f 52WfkM+4KDYP4uBUTSIH0nFpav7f4pnoovxjb0xYdAqm+C7y6YiW3sSu6NLfkH2Oire8 6bIlM+UHbUJcnwNhSWrkkSo83+rnt9O9MHkLbrn9KKbe1RZx6J1tdZmYtzq6XVrnJZeQ +a5yBSiMlhXZCcYdROSpwyYca8ZQs/illty/DIb36AfXVyACExL2sbjhX1WY+oN/yC6L slmR4bQshFB2BvxpSgfGfO9BLyDDrUZyMr4UfAYurEcnBeM5na/Xc+KPlXj2SUcUanxy yNeg== X-Gm-Message-State: APjAAAU8hU42zvcVytx5w7SorM2Nh3aLmiDsDhjX6tZ9XVS+gOyWYcoB kFLDETy2iiRnXbtFKd1DaumzES17 X-Google-Smtp-Source: APXvYqyVmcoVsAolO4gFDZe8btTpWIoSJv1W3J9QsUv66tTiotT3obfU/eDgwy35gY7LYVYClJRRAA== X-Received: by 2002:adf:ebcd:: with SMTP id v13mr1674450wrn.263.1562697359072; Tue, 09 Jul 2019 11:35:59 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-6e3f-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:6e3f::5]) by smtp.gmail.com with ESMTPSA id c12sm20565042wrd.21.2019.07.09.11.35.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jul 2019 11:35:58 -0700 (PDT) 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: Tue, 9 Jul 2019 20:35:48 +0200 Message-Id: <185aa104b9cd1fbea627be06eefaf7cf29d67ad0.1562695780.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.22.0 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::441 Subject: [Qemu-devel] [PATCH 08/11] audio: do not run each backend in audio_run X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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 Reviewed-by: Marc-André Lureau --- 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 9f01f6ad00..7e00c1332e 100644 --- a/audio/audio_int.h +++ b/audio/audio_int.h @@ -221,7 +221,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 6b9e0f06af..3daa7c8f8f 100644 --- a/audio/alsaaudio.c +++ b/audio/alsaaudio.c @@ -39,6 +39,7 @@ struct pollhlp { struct pollfd *pfds; int count; int mask; + AudioState *s; }; typedef struct ALSAVoiceOut { @@ -199,11 +200,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: @@ -749,6 +750,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; @@ -850,6 +852,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 6bf30ac9b3..d73cc086b6 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -835,7 +835,7 @@ static void audio_timer (void *opaque) } s->timer_last = now; - audio_run("timer"); + audio_run(s, "timer"); audio_reset_timer(s); } @@ -1237,15 +1237,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 29139ef1f5..456fba7480 100644 --- a/audio/ossaudio.c +++ b/audio/ossaudio.c @@ -110,28 +110,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)