mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pacmd: don't enter busy loop when reading from stdin very early

Browse source 
pointed out in:

https://tango.0pointer.de/pipermail/pulseaudio-discuss/2010-January/006365.html
This commit is contained in:
Lennart Poettering 2010-02-18 03:28:56 +01:00
parent 96ec29c6b2
commit 6e064d1d6d
1 changed files with 100 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

104
src/utils/pacmd.c
View file

@ -45,13 +45,6 @@
int main(int argc, char*argv[]) { int main(int argc, char*argv[]) {
enum {
WATCH_STDIN,
WATCH_STDOUT,
WATCH_SOCKET,
N_WATCH
};
pid_t pid ; pid_t pid ;
int fd = -1; int fd = -1;
int ret = 1, i; int ret = 1, i;
@ -60,7 +53,9 @@ int main(int argc, char*argv[]) {
size_t ibuf_index, ibuf_length, obuf_index, obuf_length; size_t ibuf_index, ibuf_length, obuf_index, obuf_length;
char *cli; char *cli;
pa_bool_t ibuf_eof, obuf_eof, ibuf_closed, obuf_closed; pa_bool_t ibuf_eof, obuf_eof, ibuf_closed, obuf_closed;
struct pollfd pollfd[N_WATCH]; struct pollfd pollfd[3];
struct pollfd *watch_socket, *watch_stdin, *watch_stdout;
int stdin_type = 0, stdout_type = 0, fd_type = 0; int stdin_type = 0, stdout_type = 0, fd_type = 0;
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
@ -129,32 +124,53 @@ int main(int argc, char*argv[]) {
ibuf_eof = TRUE; ibuf_eof = TRUE;
} }
pa_zero(pollfd);
pollfd[WATCH_STDIN].fd = STDIN_FILENO;
pollfd[WATCH_STDOUT].fd = STDOUT_FILENO;
pollfd[WATCH_SOCKET].fd = fd;
for (;;) { for (;;) {
struct pollfd *p;
if (ibuf_eof && if (ibuf_eof &&
obuf_eof && obuf_eof &&
ibuf_length <= 0 && ibuf_length <= 0 &&
obuf_length <= 0) obuf_length <= 0)
break; break;
pollfd[WATCH_STDIN].events = pollfd[WATCH_STDOUT].events = pollfd[WATCH_SOCKET].events = 0; if (ibuf_length <= 0 && ibuf_eof && !ibuf_closed) {
shutdown(fd, SHUT_WR);
ibuf_closed = TRUE;
}
if (obuf_length > 0) if (obuf_length <= 0 && obuf_eof && !obuf_closed) {
pollfd[WATCH_STDOUT].events |= POLLOUT; shutdown(fd, SHUT_RD);
else if (!obuf_eof) obuf_closed = TRUE;
pollfd[WATCH_SOCKET].events |= POLLIN; }
if (ibuf_length > 0) pa_zero(pollfd);
pollfd[WATCH_SOCKET].events |= POLLOUT;
else if (!ibuf_eof)
pollfd[WATCH_STDIN].events |= POLLIN;
if (poll(pollfd, N_WATCH, -1) < 0) { p = pollfd;
if (ibuf_length > 0 || (!obuf_eof && obuf_length <= 0)) {
watch_socket = p++;
watch_socket->fd = fd;
watch_socket->events =
(ibuf_length > 0 ? POLLOUT : 0) |
(!obuf_eof && obuf_length <= 0 ? POLLIN : 0);
} else
watch_socket = NULL;
if (!ibuf_eof && ibuf_length <= 0) {
watch_stdin = p++;
watch_stdin->fd = STDIN_FILENO;
watch_stdin->events = POLLIN;
} else
watch_stdin = NULL;
if (obuf_length > 0) {
watch_stdout = p++;
watch_stdout->fd = STDOUT_FILENO;
watch_stdout->events = POLLOUT;
} else
watch_stdout = NULL;
if (poll(pollfd, p-pollfd, -1) < 0) {
if (errno == EINTR) if (errno == EINTR)
continue; continue;
@ -163,9 +179,10 @@ int main(int argc, char*argv[]) {
goto fail; goto fail;
} }
if (pollfd[WATCH_STDIN].revents & POLLIN) { if (watch_stdin) {
if (watch_stdin->revents & POLLIN) {
ssize_t r; ssize_t r;
pa_assert(!ibuf_length); pa_assert(ibuf_length <= 0);
if ((r = pa_read(STDIN_FILENO, ibuf, sizeof(ibuf), &stdin_type)) <= 0) { if ((r = pa_read(STDIN_FILENO, ibuf, sizeof(ibuf), &stdin_type)) <= 0) {
if (r < 0) { if (r < 0) {
@ -178,11 +195,14 @@ int main(int argc, char*argv[]) {
ibuf_length = (size_t) r; ibuf_length = (size_t) r;
ibuf_index = 0; ibuf_index = 0;
} }
} else if (watch_stdin->revents & POLLHUP)
ibuf_eof = TRUE;
} }
if (pollfd[WATCH_SOCKET].revents & POLLIN) { if (watch_socket) {
if (watch_socket->revents & POLLIN) {
ssize_t r; ssize_t r;
pa_assert(!obuf_length); pa_assert(obuf_length <= 0);
if ((r = pa_read(fd, obuf, sizeof(obuf), &fd_type)) <= 0) { if ((r = pa_read(fd, obuf, sizeof(obuf), &fd_type)) <= 0) {
if (r < 0) { if (r < 0) {
@ -195,14 +215,17 @@ int main(int argc, char*argv[]) {
obuf_length = (size_t) r; obuf_length = (size_t) r;
obuf_index = 0; obuf_index = 0;
} }
} else if (watch_socket->revents & POLLHUP)
obuf_eof = TRUE;
} }
if (pollfd[WATCH_STDOUT].revents & POLLHUP) { if (watch_stdout) {
if (watch_stdout->revents & POLLHUP) {
obuf_eof = TRUE; obuf_eof = TRUE;
obuf_length = 0; obuf_length = 0;
} else if (pollfd[WATCH_STDOUT].revents & POLLOUT) { } else if (watch_stdout->revents & POLLOUT) {
ssize_t r; ssize_t r;
pa_assert(obuf_length); pa_assert(obuf_length > 0);
if ((r = pa_write(STDOUT_FILENO, obuf + obuf_index, obuf_length, &stdout_type)) < 0) { if ((r = pa_write(STDOUT_FILENO, obuf + obuf_index, obuf_length, &stdout_type)) < 0) {
pa_log(_("write(): %s"), strerror(errno)); pa_log(_("write(): %s"), strerror(errno));
@ -212,13 +235,15 @@ int main(int argc, char*argv[]) {
obuf_length -= (size_t) r; obuf_length -= (size_t) r;
obuf_index += obuf_index; obuf_index += obuf_index;
} }
}
if (pollfd[WATCH_SOCKET].revents & POLLHUP) { if (watch_socket) {
if (watch_socket->revents & POLLHUP) {
ibuf_eof = TRUE; ibuf_eof = TRUE;
ibuf_length = 0; ibuf_length = 0;
} if (pollfd[WATCH_SOCKET].revents & POLLOUT) { } if (watch_socket->revents & POLLOUT) {
ssize_t r; ssize_t r;
pa_assert(ibuf_length); pa_assert(ibuf_length > 0);
if ((r = pa_write(fd, ibuf + ibuf_index, ibuf_length, &fd_type)) < 0) { if ((r = pa_write(fd, ibuf + ibuf_index, ibuf_length, &fd_type)) < 0) {
pa_log(_("write(): %s"), strerror(errno)); pa_log(_("write(): %s"), strerror(errno));
@ -228,17 +253,6 @@ int main(int argc, char*argv[]) {
ibuf_length -= (size_t) r; ibuf_length -= (size_t) r;
ibuf_index += obuf_index; ibuf_index += obuf_index;
} }
if (ibuf_length <= 0 && ibuf_eof && !ibuf_closed) {
pa_close(STDIN_FILENO);
shutdown(fd, SHUT_WR);
ibuf_closed = TRUE;
}
if (obuf_length <= 0 && obuf_eof && !obuf_closed) {
shutdown(fd, SHUT_RD);
pa_close(STDOUT_FILENO);
obuf_closed = TRUE;
} }
} }