From c7922fb838faef3f743b38c0757ebc37f49ee953 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Thu, 29 Jan 2009 13:22:14 +0000 Subject: [PATCH] Add some more debug the registry. Add the full set of debug about why it's decided that a given plugin is stale or not, and include the plugin name when finalizing it. --- gst/gstplugin.c | 2 +- gst/gstregistry.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gst/gstplugin.c b/gst/gstplugin.c index 7512d4a..5e2131d 100644 --- a/gst/gstplugin.c +++ b/gst/gstplugin.c @@ -123,7 +123,7 @@ gst_plugin_finalize (GObject * object) GstRegistry *registry = gst_registry_get_default (); GList *g; - GST_DEBUG ("finalizing plugin %p", plugin); + GST_DEBUG ("finalizing plugin %" GST_PTR_FORMAT, plugin); for (g = registry->plugins; g; g = g->next) { if (g->data == (gpointer) plugin) { g_warning ("removing plugin that is still in registry"); diff --git a/gst/gstregistry.c b/gst/gstregistry.c index 591e798..d293122 100644 --- a/gst/gstregistry.c +++ b/gst/gstregistry.c @@ -1012,7 +1012,7 @@ gst_registry_scan_path_level (GstRegistryScanContext * context, if (plugin->file_mtime == file_status.st_mtime && plugin->file_size == file_status.st_size && !env_vars_changed && !(deps_changed = _priv_plugin_deps_files_changed (plugin)) && - strcmp (plugin->filename, filename) == 0) { + !strcmp (plugin->filename, filename)) { GST_LOG_OBJECT (context->registry, "file %s cached", filename); plugin->flags &= ~GST_PLUGIN_FLAG_CACHED; GST_LOG_OBJECT (context->registry, @@ -1023,10 +1023,11 @@ gst_registry_scan_path_level (GstRegistryScanContext * context, filename); GST_DEBUG_OBJECT (context->registry, "mtime %ld != %ld or size %" G_GINT64_FORMAT " != %" G_GINT64_FORMAT " or external dependency " - "env_vars changed: %d or external dependencies changed: %d", + "env_vars changed: %d or external dependencies changed: %d" + " or old path %s != new path %s", plugin->file_mtime, file_status.st_mtime, (gint64) plugin->file_size, (gint64) file_status.st_size, - env_vars_changed, deps_changed); + env_vars_changed, deps_changed, plugin->filename, filename); gst_registry_remove_plugin (context->registry, plugin); changed |= gst_registry_scan_plugin_file (context, filename, file_status.st_size, file_status.st_mtime); -- 2.7.4