mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

registry: refactor plugin lookup

Browse source 
We keep lookup plugins by their basename. Avoid creating a basename
from a filename if we can.
This commit is contained in:
Wim Taymans 2009-10-20 21:39:11 -04:00 committed by Wim Taymans
parent 1be3d5cd83
commit d722d16155
1 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
gst/gstregistry.c
View file

@ -152,8 +152,8 @@ static guint gst_registry_signals[LAST_SIGNAL] = { 0 };
static GstPluginFeature *gst_registry_lookup_feature_locked (GstRegistry * static GstPluginFeature *gst_registry_lookup_feature_locked (GstRegistry *
registry, const char *name); registry, const char *name);
static GstPlugin *gst_registry_lookup_locked (GstRegistry * registry, static GstPlugin *gst_registry_lookup_bn_locked (GstRegistry * registry,
const char *filename); const char *basename);
G_DEFINE_TYPE (GstRegistry, gst_registry, GST_TYPE_OBJECT); G_DEFINE_TYPE (GstRegistry, gst_registry, GST_TYPE_OBJECT);
static GstObjectClass *parent_class = NULL; static GstObjectClass *parent_class = NULL;
@ -361,7 +361,7 @@ gst_registry_add_plugin (GstRegistry * registry, GstPlugin * plugin)
g_return_val_if_fail (GST_IS_PLUGIN (plugin), FALSE); g_return_val_if_fail (GST_IS_PLUGIN (plugin), FALSE);
GST_OBJECT_LOCK (registry); GST_OBJECT_LOCK (registry);
existing_plugin = gst_registry_lookup_locked (registry, plugin->filename); existing_plugin = gst_registry_lookup_bn_locked (registry, plugin->basename);
if (G_UNLIKELY (existing_plugin)) { if (G_UNLIKELY (existing_plugin)) {
GST_DEBUG_OBJECT (registry, GST_DEBUG_OBJECT (registry,
"Replacing existing plugin %p with new plugin %p for filename \"%s\"", "Replacing existing plugin %p with new plugin %p for filename \"%s\"",
@ -765,30 +765,36 @@ gst_registry_lookup_feature (GstRegistry * registry, const char *name)
} }
static GstPlugin * static GstPlugin *
gst_registry_lookup_locked (GstRegistry * registry, const char *filename) gst_registry_lookup_bn_locked (GstRegistry * registry, const char *basename)
{ {
GList *g; GList *g;
GstPlugin *plugin; GstPlugin *plugin;
gchar *basename;
if (G_UNLIKELY (filename == NULL))
return NULL;
basename = g_path_get_basename (filename);
/* FIXME: use GTree speed up lookups */ /* FIXME: use GTree speed up lookups */
for (g = registry->plugins; g; g = g_list_next (g)) { for (g = registry->plugins; g; g = g_list_next (g)) {
plugin = GST_PLUGIN_CAST (g->data); plugin = GST_PLUGIN_CAST (g->data);
if (G_UNLIKELY (plugin->basename if (G_UNLIKELY (plugin->basename
&& strcmp (basename, plugin->basename) == 0)) { && strcmp (basename, plugin->basename) == 0)) {
g_free (basename);
return plugin; return plugin;
} }
} }
g_free (basename);
return NULL; return NULL;
} }
static GstPlugin *
gst_registry_lookup_bn (GstRegistry * registry, const char *basename)
{
GstPlugin *plugin;
GST_OBJECT_LOCK (registry);
plugin = gst_registry_lookup_bn_locked (registry, basename);
if (plugin)
gst_object_ref (plugin);
GST_OBJECT_UNLOCK (registry);
return plugin;
}
/** /**
* gst_registry_lookup: * gst_registry_lookup:
* @registry: the registry to look up in * @registry: the registry to look up in
@ -804,15 +810,18 @@ GstPlugin *
gst_registry_lookup (GstRegistry * registry, const char *filename) gst_registry_lookup (GstRegistry * registry, const char *filename)
{ {
GstPlugin *plugin; GstPlugin *plugin;
gchar *basename;
g_return_val_if_fail (GST_IS_REGISTRY (registry), NULL); g_return_val_if_fail (GST_IS_REGISTRY (registry), NULL);
g_return_val_if_fail (filename != NULL, NULL); g_return_val_if_fail (filename != NULL, NULL);
GST_OBJECT_LOCK (registry); basename = g_path_get_basename (filename);
plugin = gst_registry_lookup_locked (registry, filename); if (G_UNLIKELY (basename == NULL))
if (plugin) return NULL;
gst_object_ref (plugin);
GST_OBJECT_UNLOCK (registry); plugin = gst_registry_lookup_bn (registry, basename);
g_free (basename);
return plugin; return plugin;
} }
@ -995,7 +1004,7 @@ gst_registry_scan_path_level (GstRegistryScanContext * context,
/* plug-ins are considered unique by basename; if the given name /* plug-ins are considered unique by basename; if the given name
* was already seen by the registry, we ignore it */ * was already seen by the registry, we ignore it */
plugin = gst_registry_lookup (context->registry, filename); plugin = gst_registry_lookup_bn (context->registry, dirent);
if (plugin) { if (plugin) {
gboolean env_vars_changed, deps_changed = FALSE; gboolean env_vars_changed, deps_changed = FALSE;