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

Revert "remove mlock and use MAP_LOCKED"

Browse source 
This reverts commit ab91e94b59.

When no memory can be locked, the mmap fails with -EAGAIN.

Fixes #592
This commit is contained in:
Wim Taymans 2021-01-19 14:47:44 +01:00
parent 8c84c96fe1
commit abfc67a3ca
4 changed files with 64 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -87,6 +87,7 @@ struct globals {
};
static struct globals globals;
static bool mlock_warned = false;
#define OBJECT_CHUNK 8
@ -1722,8 +1723,6 @@ static int client_node_port_use_buffers(void *object,
/* some apps write to the input buffer so we want everything readwrite */
fl = PW_MEMMAP_FLAG_READWRITE;
}
if (c->allow_mlock)
fl |= PW_MEMMAP_FLAG_LOCKED;
/* clear previous buffers */
clear_buffers(c, mix);
@ -1806,6 +1805,16 @@ static int client_node_port_use_buffers(void *object,
} else {
pw_log_warn("unknown buffer data type %d", d->type);
}
if (c->allow_mlock && mlock(d->data, d->maxsize) < 0) {
if (errno != ENOMEM || !mlock_warned) {
pw_log_warn(NAME" %p: Failed to mlock memory %p %u: %s", c,
d->data, d->maxsize,
errno == ENOMEM ?
"This is not a problem but for best performance, "
"consider increasing RLIMIT_MEMLOCK" : strerror(errno));
mlock_warned |= errno == ENOMEM;
}
}
}
SPA_FLAG_SET(b->flags, BUFFER_FLAG_OUT);
if (direction == SPA_DIRECTION_OUTPUT)