compress: Handle case of pause() during compress_write()
PATCH 8/14 compress: Handle case of pause() during compress_write()
If stream is paused() during a compress_write() the poll() will return 0 or -EBADFD, or the write() will return -EBADFD. This is not an error so compress_write() should not pass an error code to the caller. It should abort the write and then return the number of bytes it had written up to that point.
compress.c +8 -2
@@ -329,10 +329,13 @@ int compress_write(struct compress *compress, const void *buf, unsigned int sizeif (avail.avail < compress->config.fragment_size) {/* nothing to write so wait */ ret =poll (&fds,1 , compress->max_poll_wait_ms); +/* A pause will cause -EBADFD or zero return from driver +* This is not an error, just stop writing +*/ +if ((ret ==0 ) || (ret == -EBADFD )) +break ;if (ret <0 )return oops (compress, errno,"poll error" ); -if (ret ==0 ) -return oops (compress, -EPIPE ,"Poll timeout, Broken Pipe" );if (fds.revents &POLLOUT ) {if (ioctl (compress->fd,SNDRV_COMPRESS_AVAIL , &avail))return oops (compress, errno,"cannot get avail" );
@@ -351,6 +354,9 @@ int compress_write(struct compress *compress, const void *buf, unsigned int sizeelse to_write = size; written =write (compress->fd, cbuf, to_write); +/* If play was paused the write returns -EBADFD */ +if (written == -EBADFD ) +break ;if (written <0 )return oops (compress, errno,"write failed!\n" );
Signature · 1 line
1.7.2.5
If stream is paused() during a compress_write() the poll() will return 0 or -EBADFD, or the write() will return -EBADFD. This is not an error so compress_write() should not pass an error code to the caller. It should abort the write and then return the number of bytes it had written up to that point.
--- compress.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)
compress.c +8 -2
@@ -340,10 +340,13 @@ int compress_write(struct compress *compress, const void *buf, unsigned int sizeif (avail.avail < compress->config.fragment_size) {/* nothing to write so wait */ ret =poll (&fds,1 , compress->max_poll_wait_ms); +/* A pause will cause -EBADFD or zero return from driver +* This is not an error, just stop writing +*/ +if ((ret ==0 ) || (ret == -EBADFD )) +break ;if (ret <0 )return oops (compress, errno,"poll error" ); -if (ret ==0 ) -return oops (compress, -EPIPE ,"Poll timeout, Broken Pipe" );if (fds.revents &POLLOUT ) {if (ioctl (compress->fd,SNDRV_COMPRESS_AVAIL , &avail))return oops (compress, errno,"cannot get avail" );
@@ -362,6 +365,9 @@ int compress_write(struct compress *compress, const void *buf, unsigned int sizeelse to_write = size; written =write (compress->fd, cbuf, to_write); +/* If play was paused the write returns -EBADFD */ +if (written == -EBADFD ) +break ;if (written <0 )return oops (compress, errno,"write failed!" );
Signature · 1 line
1.7.2.5