mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-06-17 14:33:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

connection: Convert 0 to an actual buffer size limit sooner

Browse source 
This avoids special cases in get_max_size_bits_for_size() and
ring_buffer_get_bits_for_size().

Signed-off-by: Demi Marie Obenour <demi@invisiblethingslab.com>
This commit is contained in:
Demi Marie Obenour 2024-08-05 13:29:40 -04:00
parent ce5c57ca77
commit 507884a123
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/connection.c
View file

@ -58,7 +58,7 @@ struct wl_ring_buffer {
char *data; char *data;
size_t head, tail; size_t head, tail;
uint32_t size_bits; uint32_t size_bits;
uint32_t max_size_bits; /* 0 for unlimited */ uint32_t max_size_bits;
}; };
#define MAX_FDS_OUT 28 #define MAX_FDS_OUT 28
@ -197,9 +197,6 @@ get_max_size_bits_for_size(size_t buffer_size)
{ {
uint32_t max_size_bits = WL_BUFFER_DEFAULT_SIZE_POT; uint32_t max_size_bits = WL_BUFFER_DEFAULT_SIZE_POT;
/* buffer_size == 0 means unbound buffer size */
if (buffer_size == 0)
return 0;
while (max_size_bits < 8 * sizeof(size_t) && size_pot(max_size_bits) < buffer_size) while (max_size_bits < 8 * sizeof(size_t) && size_pot(max_size_bits) < buffer_size)
max_size_bits++; max_size_bits++;
@ -231,10 +228,7 @@ ring_buffer_get_bits_for_size(struct wl_ring_buffer *b, size_t net_size)
{ {
size_t max_size_bits = get_max_size_bits_for_size(net_size); size_t max_size_bits = get_max_size_bits_for_size(net_size);
if (max_size_bits < WL_BUFFER_DEFAULT_SIZE_POT) if (max_size_bits > b->max_size_bits)
max_size_bits = WL_BUFFER_DEFAULT_SIZE_POT;
if (b->max_size_bits > 0 && max_size_bits > b->max_size_bits)
max_size_bits = b->max_size_bits; max_size_bits = b->max_size_bits;
return max_size_bits; return max_size_bits;
@ -300,7 +294,12 @@ wl_connection_set_max_buffer_size(struct wl_connection *connection,
{ {
uint32_t max_size_bits; uint32_t max_size_bits;
max_size_bits = get_max_size_bits_for_size(max_buffer_size); /* Max buffer size 0 means allow buffers limited only by integer
* sizes or available memory, whichever runs out first.
*/
max_size_bits = max_buffer_size != 0 ?
get_max_size_bits_for_size(max_buffer_size) :
WL_BUFFER_MAX_SIZE_POT;
connection->fds_in.max_size_bits = max_size_bits; connection->fds_in.max_size_bits = max_size_bits;
ring_buffer_ensure_space(&connection->fds_in, 0); ring_buffer_ensure_space(&connection->fds_in, 0);