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

pstream: Log "Cannot send block reference..." only once per pstream

Browse source 
Despite the ratelimiting, this error gets logged too much.

I fixed a typo (Fallig -> Falling) while at it.

Related: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/824
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/265>
This commit is contained in:
Tanu Kaskinen 2020-03-14 08:22:44 +02:00 • committed by PulseAudio Marge Bot
parent 7ec6ee4725
commit 3afb7f8c08
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/pulsecore/pstream.c
View file

@ -154,6 +154,7 @@ struct pa_pstream {
* @registered_memfd_ids: registered memfd pools SHM IDs. Check
* pa_pstream_register_memfd_mempool() for more information. */
bool use_shm, use_memfd;
bool non_registered_memfd_id_error_logged;
pa_idxset *registered_memfd_ids;
pa_memimport *import;
@ -677,9 +678,11 @@ static void prepare_next_write_item(pa_pstream *p) {
flags |= PA_FLAG_SHMDATA_MEMFD_BLOCK;
send_payload = false;
} else {
if (pa_log_ratelimit(PA_LOG_ERROR)) {
if (!p->non_registered_memfd_id_error_logged) {
pa_log("Cannot send block reference with non-registered memfd ID = %u", shm_id);
pa_log("Fallig back to copying full block data over socket");
pa_log("Falling back to copying full block data over socket");
pa_log("There's a bug report about this: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/824");
p->non_registered_memfd_id_error_logged = true;
}
}
}