aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--render.c12
-rw-r--r--shm.c94
-rw-r--r--shm.h5
-rw-r--r--terminal.c2
4 files changed, 60 insertions, 53 deletions
diff --git a/render.c b/render.c
index 90fdae7b..c6835664 100644
--- a/render.c
+++ b/render.c
@@ -2324,19 +2324,18 @@ grid_render(struct terminal *term)
}
if (term->render.last_buf != NULL) {
- term->render.last_buf->locked = false;
- free(term->render.last_buf->scroll_damage);
- term->render.last_buf->scroll_damage = NULL;
+ shm_unref(term->render.last_buf);
+ term->render.last_buf = NULL;
}
term->render.last_buf = buf;
term->render.was_flashing = term->flash.active;
term->render.was_searching = term->is_searching;
- buf->locked = true;
+ shm_addref(buf);
buf->age = 0;
- xassert(buf->scroll_damage == NULL);
+ free(term->render.last_buf->scroll_damage);
buf->scroll_damage_count = tll_length(term->grid->scroll_damage);
buf->scroll_damage = xmalloc(
buf->scroll_damage_count * sizeof(buf->scroll_damage[0]));
@@ -3484,8 +3483,7 @@ damage_view:
tll_free(term->normal.scroll_damage);
tll_free(term->alt.scroll_damage);
- if (term->render.last_buf != NULL)
- term->render.last_buf->locked = false;
+ shm_unref(term->render.last_buf);
term->render.last_buf = NULL;
term_damage_view(term);
render_refresh_csd(term);
diff --git a/shm.c b/shm.c
index 87900f01..a2f8cffe 100644
--- a/shm.c
+++ b/shm.c
@@ -71,6 +71,7 @@ struct buffer_pool {
struct buffer_private {
struct buffer public;
+ size_t ref_count;
size_t size;
bool busy; /* Owned by compositor */
@@ -79,7 +80,6 @@ struct buffer_private {
off_t offset; /* Offset into memfd where data begins */
bool scrollable;
- bool purge; /* True if this buffer should be destroyed */
};
static tll(struct buffer_private) buffers;
@@ -148,6 +148,19 @@ buffer_destroy(struct buffer_private *buf)
pixman_region32_fini(&buf->public.dirty);
}
+static bool
+buffer_unref_no_remove_from_cache(struct buffer_private *buf)
+{
+ if (buf->ref_count > 0)
+ buf->ref_count--;
+
+ if (buf->ref_count > 0 || buf->busy)
+ return false;
+
+ buffer_destroy(buf);
+ return true;
+}
+
void
shm_fini(void)
{
@@ -187,6 +200,9 @@ buffer_release(void *data, struct wl_buffer *wl_buffer)
xassert(buffer->public.wl_buf == wl_buffer);
xassert(buffer->busy);
buffer->busy = false;
+
+ if (buffer->ref_count == 0)
+ shm_unref(&buffer->public);
}
static const struct wl_buffer_listener buffer_listener = {
@@ -272,30 +288,6 @@ err:
}
static void NOINLINE
-destroy_all_purgeables(void)
-{
- /* Purge buffers marked for purging */
- tll_foreach(buffers, it) {
- if (it->item.public.locked)
- continue;
-
- if (!it->item.purge)
- continue;
-
- if (it->item.busy)
- continue;
-
- LOG_DBG("purging buffer %p (width=%d, height=%d): %zu KB",
- (void *)&it->item,
- it->item.public.width, it->item.public.height,
- it->item.size / 1024);
-
- buffer_destroy(&it->item);
- tll_remove(buffers, it);
- }
-}
-
-static void NOINLINE
get_new_buffers(struct wl_shm *shm, size_t count,
struct buffer_description info[static count],
struct buffer *bufs[static count],
@@ -444,9 +436,9 @@ get_new_buffers(struct wl_shm *shm, size_t count,
.age = 1234, /* Force a full repaint */
},
.cookie = info[i].cookie,
+ .ref_count = immediate_purge ? 0 : 1,
.size = sizes[i],
.busy = true,
- .purge = immediate_purge,
.pool = pool,
.scrollable = scrollable,
.offset = 0,
@@ -500,7 +492,6 @@ shm_get_many(struct wl_shm *shm, size_t count,
struct buffer *bufs[static count],
size_t pix_instances)
{
- destroy_all_purgeables();
get_new_buffers(shm, count, info, bufs, pix_instances, false, true);
}
@@ -508,8 +499,6 @@ struct buffer *
shm_get_buffer(struct wl_shm *shm, int width, int height, unsigned long cookie,
bool scrollable, size_t pix_instances)
{
- destroy_all_purgeables();
-
struct buffer_private *cached = NULL;
tll_foreach(buffers, it) {
if (it->item.public.width != width)
@@ -532,7 +521,6 @@ shm_get_buffer(struct wl_shm *shm, int width, int height, unsigned long cookie,
LOG_DBG("cookie=%lx: re-using buffer from cache (buf=%p)",
cookie, (void *)&it->item);
it->item.busy = true;
- it->item.purge = false;
pixman_region32_clear(&it->item.public.dirty);
free(it->item.public.scroll_damage);
it->item.public.scroll_damage = NULL;
@@ -543,10 +531,12 @@ shm_get_buffer(struct wl_shm *shm, int width, int height, unsigned long cookie,
* re-use. Pick the “youngest” one, and mark the
* other one for purging */
if (it->item.public.age < cached->public.age) {
- cached->purge = true;
+ shm_unref(&cached->public);
cached = &it->item;
- } else
- it->item.purge = true;
+ } else {
+ if (buffer_unref_no_remove_from_cache(&it->item))
+ tll_remove(buffers, it);
+ }
}
}
}
@@ -559,14 +549,12 @@ shm_get_buffer(struct wl_shm *shm, int width, int height, unsigned long cookie,
if (it->item.cookie != cookie)
continue;
- if (it->item.busy)
- continue;
-
if (it->item.public.width == width && it->item.public.height == height)
continue;
LOG_DBG("cookie=%lx: marking buffer %p for purging", cookie, (void *)&it->item);
- it->item.purge = true;
+ if (buffer_unref_no_remove_from_cache(&it->item))
+ tll_remove(buffers, it);
}
struct buffer *ret;
@@ -879,13 +867,31 @@ shm_purge(struct wl_shm *shm, unsigned long cookie)
if (it->item.cookie != cookie)
continue;
- if (it->item.busy) {
- LOG_DBG("deferring purge of 'busy' buffer (width=%d, height=%d)",
- it->item.public.width, it->item.public.height);
- it->item.purge = true;
- } else {
- buffer_destroy(&it->item);
+ if (buffer_unref_no_remove_from_cache(&it->item))
tll_remove(buffers, it);
- }
+ }
+}
+
+void
+shm_addref(struct buffer *_buf)
+{
+ struct buffer_private *buf = (struct buffer_private *)_buf;
+ buf->ref_count++;
+}
+
+void
+shm_unref(struct buffer *_buf)
+{
+ if (_buf == NULL)
+ return;
+
+ struct buffer_private *buf = (struct buffer_private *)_buf;
+ tll_foreach(buffers, it) {
+ if (&it->item != buf)
+ continue;
+
+ if (buffer_unref_no_remove_from_cache(buf))
+ tll_remove(buffers, it);
+ break;
}
}
diff --git a/shm.h b/shm.h
index 435f9de4..18941588 100644
--- a/shm.h
+++ b/shm.h
@@ -10,8 +10,6 @@
struct damage;
struct buffer {
- bool locked; /* Caller owned, shm won’t destroy it */
-
int width;
int height;
int stride;
@@ -23,6 +21,7 @@ struct buffer {
size_t pix_instances;
unsigned age;
+
struct damage *scroll_damage;
size_t scroll_damage_count;
pixman_region32_t dirty;
@@ -74,6 +73,8 @@ bool shm_scroll(struct wl_shm *shm, struct buffer *buf, int rows,
int top_margin, int top_keep_rows,
int bottom_margin, int bottom_keep_rows);
+void shm_addref(struct buffer *buf);
+void shm_unref(struct buffer *buf);
void shm_purge(struct wl_shm *shm, unsigned long cookie);
struct terminal;
diff --git a/terminal.c b/terminal.c
index 488ac316..c7776f28 100644
--- a/terminal.c
+++ b/terminal.c
@@ -35,6 +35,7 @@
#include "selection.h"
#include "sixel.h"
#include "slave.h"
+#include "shm.h"
#include "spawn.h"
#include "url-mode.h"
#include "util.h"
@@ -1457,6 +1458,7 @@ term_destroy(struct terminal *term)
sem_destroy(&term->render.workers.done);
xassert(tll_length(term->render.workers.queue) == 0);
tll_free(term->render.workers.queue);
+ shm_unref(term->render.last_buf);
tll_free(term->tab_stops);