From: Adam Miartus <amiartus@de.adit-jv.com>
To: patch@alsa-project.org
Cc: alsa-devel@alsa-project.org
Subject: [PATCH 1/2] pcm_file: do not disrupt playback on output file write fail
Date: Wed, 12 Jun 2019 08:48:27 +0200 [thread overview]
Message-ID: <1560322108-17074-2-git-send-email-amiartus@de.adit-jv.com> (raw)
In-Reply-To: <1560322108-17074-1-git-send-email-amiartus@de.adit-jv.com>
previously playback could be interrupted by snd_pcm_file_add_frames:
assert(file->wbuf_used_bytes < file->wbuf_size_bytes)
in case snd_pcm_file_write_bytes fails to write full amount of bytes
to file, variable wbuf_used_bytes would not be fully decremented by
requested amount of bytes function was called with
for the assert to trigger, multiple write fails need to happen, so
that wbuf_used_bytes overflows wbuf_size_bytes,
this patch will allow application to report error code to api user
who might have an idea how to recover, before assert is triggered,
also reporting error along with the print out message might give user
a better idea of what is going on, where previously reason for
mentioned assert was not immediately clear
Signed-off-by: Adam Miartus <amiartus@de.adit-jv.com>
Reviewed-by: Timo Wischer <twischer@de.adit-jv.com>
---
src/pcm/pcm_file.c | 34 +++++++++++++++++++++-------------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c
index 1ef80b5..0a8d98d 100644
--- a/src/pcm/pcm_file.c
+++ b/src/pcm/pcm_file.c
@@ -346,7 +346,7 @@ static int write_wav_header(snd_pcm_t *pcm)
sizeof(file->wav_header) ||
write(file->fd, header2, sizeof(header2)) != sizeof(header2)) {
int err = errno;
- SYSERR("Write error.\n");
+ SYSERR("%s write header failed, file data may be corrupt", file->fname);
return -err;
}
return 0;
@@ -381,27 +381,29 @@ static void fixup_wav_header(snd_pcm_t *pcm)
-static void snd_pcm_file_write_bytes(snd_pcm_t *pcm, size_t bytes)
+/* return error code in case write failed */
+static int snd_pcm_file_write_bytes(snd_pcm_t *pcm, size_t bytes)
{
snd_pcm_file_t *file = pcm->private_data;
+ snd_pcm_sframes_t err = 0;
assert(bytes <= file->wbuf_used_bytes);
if (file->format == SND_PCM_FILE_FORMAT_WAV &&
!file->wav_header.fmt) {
- if (write_wav_header(pcm) < 0)
- return;
+ err = write_wav_header(pcm);
+ if (err < 0)
+ return err;
}
while (bytes > 0) {
- snd_pcm_sframes_t err;
size_t n = bytes;
size_t cont = file->wbuf_size_bytes - file->file_ptr_bytes;
if (n > cont)
n = cont;
err = write(file->fd, file->wbuf + file->file_ptr_bytes, n);
if (err < 0) {
- SYSERR("write failed");
- break;
+ SYSERR("%s write failed, file data may be corrupt", file->fname);
+ return err;
}
bytes -= err;
file->wbuf_used_bytes -= err;
@@ -412,15 +414,17 @@ static void snd_pcm_file_write_bytes(snd_pcm_t *pcm, size_t bytes)
if ((snd_pcm_uframes_t)err != n)
break;
}
+ return 0;
}
-static void snd_pcm_file_add_frames(snd_pcm_t *pcm,
- const snd_pcm_channel_area_t *areas,
- snd_pcm_uframes_t offset,
- snd_pcm_uframes_t frames)
+static int snd_pcm_file_add_frames(snd_pcm_t *pcm,
+ const snd_pcm_channel_area_t *areas,
+ snd_pcm_uframes_t offset,
+ snd_pcm_uframes_t frames)
{
snd_pcm_file_t *file = pcm->private_data;
while (frames > 0) {
+ int err = 0;
snd_pcm_uframes_t n = frames;
snd_pcm_uframes_t cont = file->wbuf_size - file->appl_ptr;
snd_pcm_uframes_t avail = file->wbuf_size - snd_pcm_bytes_to_frames(pcm, file->wbuf_used_bytes);
@@ -437,10 +441,14 @@ static void snd_pcm_file_add_frames(snd_pcm_t *pcm,
if (file->appl_ptr == file->wbuf_size)
file->appl_ptr = 0;
file->wbuf_used_bytes += snd_pcm_frames_to_bytes(pcm, n);
- if (file->wbuf_used_bytes > file->buffer_bytes)
- snd_pcm_file_write_bytes(pcm, file->wbuf_used_bytes - file->buffer_bytes);
+ if (file->wbuf_used_bytes > file->buffer_bytes) {
+ err = snd_pcm_file_write_bytes(pcm, file->wbuf_used_bytes - file->buffer_bytes);
+ if (err < 0)
+ return err;
+ }
assert(file->wbuf_used_bytes < file->wbuf_size_bytes);
}
+ return 0;
}
static int snd_pcm_file_close(snd_pcm_t *pcm)
--
2.7.4
next prev parent reply other threads:[~2019-06-12 6:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-12 6:48 [PATCH 0/2] v2 pcm_file propagate write error instead of an assert Adam Miartus
2019-06-12 6:48 ` Adam Miartus [this message]
2019-06-12 6:48 ` [PATCH 2/2] pcm_file: report write output file error to api user Adam Miartus
2019-06-15 8:35 ` [PATCH 0/2] v2 pcm_file propagate write error instead of an assert Takashi Iwai
2019-06-18 6:30 ` [ALSA patch] " Takashi Iwai
2019-06-18 6:49 ` Miartus, Adam (Arion Recruitment; ADITG/ESM)
-- strict thread matches above, loose matches on Subject: below --
2019-06-07 12:23 [PATCH 0/2] pcm_file write file assert case handling Adam Miartus
2019-06-07 12:23 ` [PATCH 1/2] pcm_file: do not disrupt playback on output file write fail Adam Miartus
2019-06-08 18:38 ` Cezary Rojewski
2019-06-11 7:52 ` Miartus, Adam (Arion Recruitment; ADITG/ESM)
2019-06-11 16:03 ` Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1560322108-17074-2-git-send-email-amiartus@de.adit-jv.com \
--to=amiartus@de.adit-jv.com \
--cc=alsa-devel@alsa-project.org \
--cc=patch@alsa-project.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.