aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-11-01 23:35:02 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-11-01 23:35:02 +0000
commit5812242405bf5e9efb3f6148596872fd99d5dd71 (patch)
tree31b98ce221492c0f0d9ed53bb1ae8ce284460d5f
parentshm: associate a 'cookie' with each buffer (diff)
shm: purge unused buffers
When we need to create a new buffer (because the cache doesn't have any buffers of correct size, or because they're all busy), purge buffers with a size mismatch.
-rw-r--r--shm.c35
1 files changed, 28 insertions, 7 deletions
diff --git a/shm.c b/shm.c
index 7c649ac3..6785cbfb 100644
--- a/shm.c
+++ b/shm.c
@@ -18,6 +18,15 @@
static tll(struct buffer) buffers;
static void
+buffer_destroy(struct buffer *buf)
+{
+ if (buf->pix != NULL)
+ pixman_image_unref(buf->pix);
+ wl_buffer_destroy(buf->wl_buf);
+ munmap(buf->mmapped, buf->size);
+}
+
+static void
buffer_release(void *data, struct wl_buffer *wl_buffer)
{
struct buffer *buffer = data;
@@ -48,6 +57,24 @@ shm_get_buffer(struct wl_shm *shm, int width, int height, unsigned long cookie)
}
}
+ /* Purge old buffers associated with this cookie */
+ tll_foreach(buffers, it) {
+ if (it->item.cookie != cookie)
+ continue;
+
+ if (it->item.busy)
+ continue;
+
+ if (it->item.width == width && it->item.height == height)
+ continue;
+
+ LOG_DBG("cookie=%lx: purging buffer (width=%d, height=%d)",
+ cookie, it->item.width, it->item.height);
+
+ buffer_destroy(&it->item);
+ tll_remove(buffers, it);
+ }
+
/*
* No existing buffer available. Create a new one by:
*
@@ -151,13 +178,7 @@ void
shm_fini(void)
{
tll_foreach(buffers, it) {
- struct buffer *buf = &it->item;
-
- if (buf->pix != NULL)
- pixman_image_unref(buf->pix);
- wl_buffer_destroy(buf->wl_buf);
- munmap(buf->mmapped, buf->size);
-
+ buffer_destroy(&it->item);
tll_remove(buffers, it);
}
}