mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-30 11:10:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

shm: associate a 'cookie' with each buffer

Browse source 
When re-using a buffer from cache, only re-use ones with a matching
cookie.

This prevents contention between multiple terminal windows.
This commit is contained in:
Daniel Eklöf 2019-11-02 00:33:37 +01:00
parent 8df82938b0
commit 00b46455a0
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
shm.c
View file

@ -10,7 +10,7 @@
#include <pixman.h>
#define LOG_MODULE "shm"
#define LOG_ENABLE_DBG 1
#define LOG_ENABLE_DBG 0
#include "log.h"
#include "stride.h"
#include "tllist.h"
@ -31,13 +31,18 @@ static const struct wl_buffer_listener buffer_listener = {
};
struct buffer *
shm_get_buffer(struct wl_shm *shm, int width, int height)
shm_get_buffer(struct wl_shm *shm, int width, int height, unsigned long cookie)
{
tll_foreach(buffers, it) {
if (it->item.width != width || it->item.height != height)
if (it->item.width != width)
continue;
if (it->item.height != height)
continue;
if (it->item.cookie != cookie)
continue;
if (!it->item.busy) {
LOG_DBG("cookie=%lx: re-using buffer from cache", cookie);
it->item.busy = true;
return &it->item;
}
@ -73,7 +78,7 @@ shm_get_buffer(struct wl_shm *shm, int width, int height)
/* Total size */
size = stride * height;
LOG_DBG("allocating a %zu KB pool", size / 1024);
LOG_DBG("cookie=%lx: allocating new buffer: %zu KB", cookie, size / 1024);
if (ftruncate(pool_fd, size) == -1) {
LOG_ERRNO("failed to truncate SHM pool");
@ -111,6 +116,7 @@ shm_get_buffer(struct wl_shm *shm, int width, int height)
tll_push_back(
buffers,
((struct buffer){
.cookie = cookie,
.width = width,
.height = height,
.stride = stride,