mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-09 13:30:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle EINTR and EAGAIN

Browse source 
Just do the call again instead of failing or logging an error.

Fixes #358
This commit is contained in:
Wim Taymans 2020-11-02 14:51:07 +01:00
parent 395a30b5d6
commit e094640c7b
8 changed files with 33 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/examples/media-session/media-session.c
View file

@ -1345,6 +1345,8 @@ int sm_media_session_roundtrip(struct sm_media_session *sess)
pw_loop_enter(loop);
while (!done) {
if ((res = pw_loop_iterate(loop, -1)) < 0) {
if (res == -EINTR || res == -EAGAIN)
continue;
pw_log_warn(NAME" %p: iterate error %d (%s)",
loop, res, spa_strerror(res));
break;

4
src/pipewire/data-loop.c
View file

@ -43,7 +43,7 @@ int pw_data_loop_wait(struct pw_data_loop *this, int timeout)
break;
}
if ((res = pw_loop_iterate(this->loop, timeout)) < 0) {
if (errno == EINTR)
if (res == -EINTR || res == -EAGAIN)
continue;
}
break;
@ -77,7 +77,7 @@ static void *do_loop(void *user_data)
while (this->running) {
if ((res = pw_loop_iterate(this->loop, -1)) < 0) {
if (errno == EINTR)
if (res == -EINTR || res == -EAGAIN)
continue;
pw_log_error(NAME" %p: iterate error %d (%s)",
this, res, spa_strerror(res));

5
src/pipewire/main-loop.c
View file

@ -153,9 +153,12 @@ int pw_main_loop_run(struct pw_main_loop *loop)
loop->running = true;
pw_loop_enter(loop->loop);
while (loop->running) {
if ((res = pw_loop_iterate(loop->loop, -1)) < 0)
if ((res = pw_loop_iterate(loop->loop, -1)) < 0) {
if (res == -EINTR || res == -EAGAIN)
continue;
pw_log_warn(NAME" %p: iterate error %d (%s)",
loop, res, spa_strerror(res));
}
}
pw_loop_leave(loop->loop);
return res;

5
src/pipewire/thread-loop.c
View file

@ -238,9 +238,12 @@ static void *do_loop(void *user_data)
pw_loop_enter(this->loop);
while (this->running) {
if ((res = pw_loop_iterate(this->loop, -1)) < 0)
if ((res = pw_loop_iterate(this->loop, -1)) < 0) {
if (res == -EINTR || res == -EAGAIN)
continue;
pw_log_warn(NAME" %p: iterate error %d (%s)",
this, res, spa_strerror(res));
}
}
pw_log_debug(NAME" %p: leave thread", this);
pw_loop_leave(this->loop);