mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve mlock failure warning message

Browse source
This commit is contained in:
Wim Taymans 2020-01-29 11:07:26 +01:00
parent 8de267cf02
commit 7450bfd88b
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pipewire-jack/src/pipewire-jack.c
View file

@ -1594,9 +1594,13 @@ static int client_node_port_use_buffers(void *object,
} else { } else {
pw_log_warn("unknown buffer data type %d", d->type); pw_log_warn("unknown buffer data type %d", d->type);
} }
if (mlock(d->data, d->maxsize) < 0) if (mlock(d->data, d->maxsize) < 0) {
pw_log_warn(NAME" %p: Failed to mlock memory %p %u: %m", c, pw_log_warn(NAME" %p: Failed to mlock memory %p %u: %s", c,
d->data, d->maxsize); d->data, d->maxsize,
errno == ENOMEM ?
"This is not a problem but for best performance, "
"consider increasing RLIMIT_MEMLOCK" : strerror(errno));
}
} }
init_buffer(p, p->emptyptr, MAX_BUFFER_FRAMES); init_buffer(p, p->emptyptr, MAX_BUFFER_FRAMES);

7
src/modules/module-client-node/remote-node.c
View file

@ -619,8 +619,11 @@ client_node_port_use_buffers(void *object,
bid->mem = mm; bid->mem = mm;
if (mlock(mm->ptr, mm->size) < 0) if (mlock(mm->ptr, mm->size) < 0)
pw_log_warn("Failed to mlock memory %p %u: %m", pw_log_warn("Failed to mlock memory %p %u: %s",
mm->ptr, mm->size); mm->ptr, mm->size,
errno == ENOMEM ?
"This is not a problem but for best performance, "
"consider increasing RLIMIT_MEMLOCK" : strerror(errno));
size = sizeof(struct spa_buffer); size = sizeof(struct spa_buffer);
for (j = 0; j < buffers[i].buffer->n_metas; j++) for (j = 0; j < buffers[i].buffer->n_metas; j++)