diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-07-11 08:22:47 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-07-11 08:22:47 +0000 |
| commit | 107cbb10157b165e19ed2f7fb747c60c670fe6c5 (patch) | |
| tree | bed5215d7138f489cb8374776ce993c5ce96f1bd | |
| parent | wayland: explicitly purge all SHM pixmaps when destroying window (diff) | |
shm: close pool FD if buffer doesn’t support SHM scrolling
The only reason to keep the pool FD open is if we’re going to SHM
scroll the buffer; we need the FD for fallocate(FALLOC_FL_PUNCH_HOLE).
In all other cases, there’s absolutely no need to keep the FD
open. Thus, close it as soon as we’ve instantiated the buffer. This
frees up FDs, and help keep foot from FD ulimit.
| -rw-r--r-- | shm.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -156,7 +156,6 @@ page_size(void) static bool instantiate_offset(struct wl_shm *shm, struct buffer *buf, off_t new_offset) { - xassert(buf->fd >= 0); xassert(buf->mmapped == NULL); xassert(buf->wl_buf == NULL); xassert(buf->pix == NULL); @@ -417,6 +416,12 @@ shm_get_buffer(struct wl_shm *shm, int width, int height, unsigned long cookie, } #endif + if (!shm_can_scroll(ret)) { + /* We only need to keep the pool FD open if we’re going to SHM + * scroll it */ + close(pool_fd); + } + return ret; err: |
