Skip to content

st: Limit texture loading to 9 parallel operations #13947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leigh123linux wants to merge 1 commit into
base: master
Choose a base branch
from
Open

st: Limit texture loading to 9 parallel operations #13947

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions src/st/st-texture-cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
#define CACHE_PREFIX_FILE "file:"
#define CACHE_PREFIX_FILE_FOR_CAIRO "file-for-cairo:"

/* Arbitrary cap on concurrent texture loads in flight. See comment on
* loading_textures_counter in StTextureCachePrivate above. */
#define MAX_PARALLEL_LOAD_TASKS 9

struct _StTextureCachePrivate
{
GtkIconTheme *icon_theme;
Expand All @@ -56,11 +60,22 @@ struct _StTextureCachePrivate
GHashTable *image_type_table;

GCancellable *cancellable;

/* Number of textures currently loading, and requests deferred because
* MAX_PARALLEL_LOAD_TASKS was reached. Rate-limiting concurrent loads
* avoids starving GTask's default thread pool scheduler -- notably an
* issue now that most icon formats are loaded via glycin's sandboxed,
* per-call IPC round-trip rather than in-process, which is slow enough
* per call that submitting hundreds of requests at once (e.g. populating
* a large app menu) could leave many of them never completing. */
uint32_t loading_textures_counter;
GQueue *pending_tasks;
};

static void st_texture_cache_dispose (GObject *object);
static void st_texture_cache_finalize (GObject *object);
static void load_image_type_table (StTextureCache *cache);
static void texture_load_data_free (gpointer p);

enum
{
Expand Down Expand Up @@ -204,6 +219,8 @@ st_texture_cache_init (StTextureCache *self)

self->priv->cancellable = g_cancellable_new ();

self->priv->pending_tasks = g_queue_new ();

on_icon_theme_changed (settings, NULL, self);
}

Expand All @@ -218,6 +235,12 @@ st_texture_cache_dispose (GObject *object)
g_clear_object (&self->priv->icon_theme);
g_clear_object (&self->priv->cancellable);

if (self->priv->pending_tasks)
{
g_queue_free_full (self->priv->pending_tasks, texture_load_data_free);
self->priv->pending_tasks = NULL;
}

g_clear_pointer (&self->priv->keyed_cache, g_hash_table_destroy);
g_clear_pointer (&self->priv->keyed_surface_cache, g_hash_table_destroy);
g_clear_pointer (&self->priv->used_scales, g_hash_table_destroy);
Expand Down Expand Up @@ -371,6 +394,9 @@ texture_load_data_free (gpointer p)
g_slice_free (AsyncTextureLoadData, data);
}

static void load_texture_async (StTextureCache *cache,
AsyncTextureLoadData *data);

/**
* on_image_size_prepared:
* @pixbuf_loader: #GdkPixbufLoader loading the image
Expand Down Expand Up @@ -627,6 +653,9 @@ finish_texture_load (AsyncTextureLoadData *data,

cache = data->cache;

g_assert (cache->priv->loading_textures_counter > 0);
cache->priv->loading_textures_counter--;

g_hash_table_remove (cache->priv->outstanding_requests, data->key);

if (pixbuf == NULL)
Expand Down Expand Up @@ -672,6 +701,10 @@ finish_texture_load (AsyncTextureLoadData *data,

out:
texture_load_data_free (data);

data = g_queue_pop_head (cache->priv->pending_tasks);
if (data)
load_texture_async (cache, data);
}

static void
Expand Down Expand Up @@ -711,6 +744,14 @@ static void
load_texture_async (StTextureCache *cache,
AsyncTextureLoadData *data)
{
if (cache->priv->loading_textures_counter >= MAX_PARALLEL_LOAD_TASKS)
{
g_queue_push_tail (cache->priv->pending_tasks, data);
return;
}

cache->priv->loading_textures_counter++;

if (data->file)
{
GTask *task = g_task_new (cache, NULL, on_pixbuf_loaded, data);
Expand Down
Loading