luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 15:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gsignal: Canonicalise signal name when looking it up in an object

Browse Source 
Previously, we’d look up the signal name as passed to (for example)
`g_signal_lookup()`, and rely on the fact that signals are inserted
twice into `g_signal_key_bsa`; once in canonical form and once not.

In preparation for only inserting signals into `g_signal_key_bsa` once,
we now try looking up a signal with the given signal name and, if that
fails, try canonicalising the name and trying again.

This is a performance hit on lookups for non-canonical names, but
shouldn’t affect the performance of lookups for canonical names. If
people want performance, they should use canonical names.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Helps: #358
This commit is contained in:
Philip Withnall 2019-11-12 19:40:12 +00:00
parent 90b51805b7
commit 875e2afa55
1 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gobject/gsignal.c
View File

@ -340,6 +340,29 @@ LOOKUP_SIGNAL_NODE (guint signal_id)
/* --- functions --- */
/* @key must have already been validated with is_valid()
* Modifies @key in place. */
static void
canonicalize_key (gchar *key)
{
gchar *p;
for (p = key; *p != 0; p++)
{
gchar c = *p;
if (c == '_')
*p = '-';
}
}
/* @key must have already been validated with is_valid() */
static gboolean
is_canonical (const gchar *key)
{
return (strchr (key, '_') == NULL);
}
static inline guint
signal_id_lookup (const gchar *name,
GType itype)
@ -383,7 +406,22 @@ signal_id_lookup (const gchar *name,
}
}
g_free (ifaces);
/* If the @name is non-canonical, try again. This is the slow path — people
* should use canonical names in their queries if they want performance. */
if (!is_canonical (name))
{
guint signal_id;
gchar *name_copy = g_strdup (name);
canonicalize_key (name_copy);
signal_id = signal_id_lookup (name_copy, itype);
g_free (name_copy);
return signal_id;
}
return 0;
}