isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st: Use g_signal_handler_disconnect() to disconnect from StTheme

Browse Source 
With a high enough amount of actors, there may be enough theme nodes and
signal connections on StTheme::custom-stylesheets-changed that
g_signal_handlers_disconnect_by*() on dispose becomes expensive, this may
become a surprisingly hot spot in StWidget::style-changed.

Keep the handler ID around and use g_signal_handler_disconnect() to avoid
linear lookups for the matching func/data.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/524
This commit is contained in:
Carlos Garnacho 2019-04-30 14:42:59 +02:00
parent d57234bec9
commit fb04dafb0b
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/st/st-theme-node-private.h
View File

@ -107,6 +107,8 @@ struct _StThemeNode {
int box_shadow_min_width; int box_shadow_min_width;
int box_shadow_min_height; int box_shadow_min_height;
guint stylesheets_changed_id;
CoglPipeline *border_slices_texture; CoglPipeline *border_slices_texture;
CoglPipeline *border_slices_pipeline; CoglPipeline *border_slices_pipeline;
CoglPipeline *background_texture; CoglPipeline *background_texture;

13
src/st/st-theme-node.c
View File

@ -111,9 +111,11 @@ st_theme_node_dispose (GObject *gobject)
node->icon_colors = NULL; node->icon_colors = NULL;
} }
if (node->theme) if (node->theme && node->stylesheets_changed_id)
g_signal_handlers_disconnect_by_func (node->theme, {
on_custom_stylesheets_changed, node); g_signal_handler_disconnect (node->theme, node->stylesheets_changed_id);
node->stylesheets_changed_id = 0;
}
st_theme_node_paint_state_free (&node->cached_state); st_theme_node_paint_state_free (&node->cached_state);
@ -230,8 +232,9 @@ st_theme_node_new (StThemeContext *context,
if (theme != NULL) if (theme != NULL)
{ {
node->theme = g_object_ref (theme); node->theme = g_object_ref (theme);
g_signal_connect (node->theme, "custom-stylesheets-changed", node->stylesheets_changed_id =
G_CALLBACK (on_custom_stylesheets_changed), node); g_signal_connect (node->theme, "custom-stylesheets-changed",
G_CALLBACK (on_custom_stylesheets_changed), node);
} }
node->element_type = element_type; node->element_type = element_type;