From patchwork Fri May 2 18:46:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey X-Patchwork-Id: 4104911 X-Patchwork-Delegate: tiwai@suse.de Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6C3CA9F169 for ; Fri, 2 May 2014 18:47:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 92A5020383 for ; Fri, 2 May 2014 18:46:59 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 663EA20253 for ; Fri, 2 May 2014 18:46:57 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 1B6A32654D3; Fri, 2 May 2014 20:46:56 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,FROM_EXCESS_BASE64,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 141732652FF; Fri, 2 May 2014 20:46:45 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 71DC826531B; Fri, 2 May 2014 20:46:44 +0200 (CEST) Received: from f181.i.mail.ru (f181.i.mail.ru [94.100.185.149]) by alsa0.perex.cz (Postfix) with ESMTP id 67687265279 for ; Fri, 2 May 2014 20:46:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail2; h=Content-Transfer-Encoding:Content-Type:Message-ID:Reply-To:Date:Mime-Version:Subject:To:From; bh=fu3KDe00DF37t0K/dMCwR/p86BDteh3E+ypJSvsdoh4=; b=TadO5YmAgtKGXK/rV1PcqO2D6W4l/dIqbG26ZdnZ7iVKsY2wkOoeUUq715BOiOVMf6FmvsqiA+pSE5Loqqmj9amWjjbFMubsp2PfGgzZhFFSCoUf/0iVl/wE4GdoYoj2Fx6Yc3Cw1f/pyythGwo3HfSjVvX3DM6bN7lIdrjbI9A=; Received: from mail by f181.i.mail.ru with local (envelope-from ) id 1WgITh-0003GH-KN for alsa-devel@alsa-project.org; Fri, 02 May 2014 22:46:34 +0400 Received: from [85.198.182.49] by e.mail.ru with HTTP; Fri, 02 May 2014 22:46:33 +0400 From: =?UTF-8?B?U2VyZ2V5?= To: alsa-devel@alsa-project.org Mime-Version: 1.0 X-Mailer: Mail.Ru Mailer 1.0 X-Originating-IP: [85.198.182.49] Date: Fri, 02 May 2014 22:46:33 +0400 X-Priority: 3 (Normal) Message-ID: <1399056393.47049129@f181.i.mail.ru> X-Mras: Ok X-Spam: undefined Subject: [alsa-devel] =?utf-8?q?=5BPATCH=5D_alsa-plugins=3A_fix_polling_an?= =?utf-8?q?d_recovering_in_alsa-jack_plugin?= X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: =?UTF-8?B?U2VyZ2V5?= List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Hello. This patch fixes polling in alsa-to-jack plugin. It makes poll()+_poll_revents() return correct values whenever there's something to read/write. Additionally jack_deactivate() code makes it survive snd_pcm_recover(). It works for the code example I posted before, aplay, arecord, mozilla, etc. Comments and suggestions are welcome. diff --git a/jack/pcm_jack.c b/jack/pcm_jack.c index 7a8b24d..a39fea5 100644 --- a/jack/pcm_jack.c +++ b/jack/pcm_jack.c @@ -42,6 +42,7 @@ typedef struct { unsigned int num_ports; unsigned int hw_ptr; unsigned int sample_bits; + snd_pcm_uframes_t min_avail; unsigned int channels; snd_pcm_channel_area_t *areas; @@ -50,6 +51,41 @@ typedef struct { jack_client_t *client; } snd_pcm_jack_t; +static inline int poll_blocked(snd_pcm_ioplug_t *io) +{ + static char buf[65536]; + snd_pcm_sframes_t avail; + snd_pcm_jack_t *jack = io->private_data; + + if (io->state == SND_PCM_STATE_RUNNING) + { + avail = snd_pcm_avail_update(io->pcm); + if (avail >= 0 && avail < jack->min_avail) + { + read(io->poll_fd, &buf, sizeof buf); + return 1; + } + } + + return 0; +} + +static inline int poll_unblocked(snd_pcm_ioplug_t *io) +{ + static char buf[1]; + snd_pcm_sframes_t avail; + snd_pcm_jack_t *jack = io->private_data; + + avail = snd_pcm_avail_update(io->pcm); + if (avail < 0 || avail >= jack->min_avail) + { + write(jack->fd, &buf, 1); + return 1; + } + + return 0; +} + static void snd_pcm_jack_free(snd_pcm_jack_t *jack) { if (jack) { @@ -81,14 +117,10 @@ static int snd_pcm_jack_poll_revents(snd_pcm_ioplug_t *io, struct pollfd *pfds, unsigned int nfds, unsigned short *revents) { - static char buf[1]; - assert(pfds && nfds == 1 && revents); - read(pfds[0].fd, buf, 1); - *revents = pfds[0].revents & ~(POLLIN | POLLOUT); - if (pfds[0].revents & POLLIN) + if (pfds[0].revents & POLLIN && !poll_blocked(io)) *revents |= (io->stream == SND_PCM_STREAM_PLAYBACK) ? POLLOUT : POLLIN; return 0; } @@ -105,7 +137,6 @@ snd_pcm_jack_process_cb(jack_nframes_t nframes, snd_pcm_ioplug_t *io) snd_pcm_jack_t *jack = io->private_data; const snd_pcm_channel_area_t *areas; snd_pcm_uframes_t xfer = 0; - static char buf[1]; unsigned int channel; for (channel = 0; channel < io->channels; channel++) { @@ -145,7 +176,7 @@ snd_pcm_jack_process_cb(jack_nframes_t nframes, snd_pcm_ioplug_t *io) xfer += frames; } - write(jack->fd, buf, 1); /* for polling */ + poll_unblocked(io); /* unblock socket for polling if needed */ return 0; } @@ -154,9 +185,25 @@ static int snd_pcm_jack_prepare(snd_pcm_ioplug_t *io) { snd_pcm_jack_t *jack = io->private_data; unsigned int i; + snd_pcm_sw_params_t *swparams; + int err; jack->hw_ptr = 0; + jack->min_avail = io->period_size; + snd_pcm_sw_params_alloca(&swparams); + err = snd_pcm_sw_params_current(io->pcm, swparams); + if (err == 0) { + snd_pcm_sw_params_get_avail_min(swparams, &jack->min_avail); + } + + poll_unblocked(io); /* unblock socket for initial polling if needed */ + + if (jack->activated) { + jack_deactivate(jack->client); + jack->activated = 0; + } + if (jack->ports) return 0;