struct wl_shm_pool {
struct wl_resource *resource;
- int refcount;
+ int internal_refcount;
+ int external_refcount;
char *data;
int32_t size;
};
};
static void
-shm_pool_unref(struct wl_shm_pool *pool)
+shm_pool_unref(struct wl_shm_pool *pool, bool external)
{
- pool->refcount--;
- if (pool->refcount)
+ if (external)
+ pool->external_refcount--;
+ else
+ pool->internal_refcount--;
+
+ if (pool->internal_refcount + pool->external_refcount)
return;
munmap(pool->data, pool->size);
struct wl_shm_buffer *buffer = wl_resource_get_user_data(resource);
if (buffer->pool)
- shm_pool_unref(buffer->pool);
+ shm_pool_unref(buffer->pool, false);
free(buffer);
}
buffer->stride = stride;
buffer->offset = offset;
buffer->pool = pool;
- pool->refcount++;
+ pool->internal_refcount++;
buffer->resource =
wl_resource_create(client, &wl_buffer_interface, 1, id);
if (buffer->resource == NULL) {
wl_client_post_no_memory(client);
- shm_pool_unref(pool);
+ shm_pool_unref(pool, false);
free(buffer);
return;
}
{
struct wl_shm_pool *pool = wl_resource_get_user_data(resource);
- shm_pool_unref(pool);
+ shm_pool_unref(pool, false);
}
static void
goto err_close;
}
- pool->refcount = 1;
+ pool->internal_refcount = 1;
+ pool->external_refcount = 0;
pool->size = size;
pool->data = mmap(NULL, size,
PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
WL_EXPORT struct wl_shm_pool *
wl_shm_buffer_ref_pool(struct wl_shm_buffer *buffer)
{
- assert(buffer->pool->refcount);
+ assert(buffer->pool->internal_refcount +
+ buffer->pool->external_refcount);
- buffer->pool->refcount++;
+ buffer->pool->external_refcount++;
return buffer->pool;
}
WL_EXPORT void
wl_shm_pool_unref(struct wl_shm_pool *pool)
{
- shm_pool_unref(pool);
+ shm_pool_unref(pool, true);
}
static void