From: Thibault Saunier <tsaunier@gnome.org>
Date: Wed, 4 Feb 2015 13:50:14 +0000 (+0100)
Subject: validate: Use an actual GstRegistry to track our plugins
X-Git-Tag: 1.19.3~491^2~1407
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c90a066450b66560a12c0fa5ac007e4b76ec97f;p=platform%2Fupstream%2Fgstreamer.git

validate: Use an actual GstRegistry to track our plugins

Keeping everything internal for now

https://bugzilla.gnome.org/show_bug.cgi?id=743994
---

diff --git a/validate/gst/validate/validate.c b/validate/gst/validate/validate.c
index 479ea2e..ebd50a3 100644
--- a/validate/gst/validate/validate.c
+++ b/validate/gst/validate/validate.c
@@ -40,62 +40,34 @@
 
 GST_DEBUG_CATEGORY (gstvalidate_debug);
 
-static gboolean
-gst_validate_scan_path_for_plugins (const gchar * path)
-{
-  GDir *dir;
-  const gchar *dirent;
-  gchar *filename;
-  GstPlugin *plugin;
-  gboolean changed = FALSE;
-
-  dir = g_dir_open (path, 0, NULL);
-  if (!dir)
-    return FALSE;
-
-  while ((dirent = g_dir_read_name (dir))) {
-    GStatBuf file_status;
-
-    filename = g_build_filename (path, dirent, NULL);
-    if (g_stat (filename, &file_status) < 0) {
-      /* Plugin will be removed from cache after the scan completes if it
-       * is still marked 'cached' */
-      g_free (filename);
-      continue;
-    }
-
-    if (!(file_status.st_mode & S_IFREG)) {
-      g_free (filename);
-      continue;
-    }
-    if (!g_str_has_suffix (dirent, G_MODULE_SUFFIX)) {
-      GST_TRACE ("extension is not recognized as module file, ignoring file %s",
-          filename);
-      g_free (filename);
-      continue;
-    }
+static GMutex _gst_validate_registry_mutex;
+static GstRegistry *_gst_validate_registry_default = NULL;
 
-    plugin = gst_plugin_load_file (filename, NULL);
-    if (plugin) {
-      GST_DEBUG ("Plugin %s loaded", filename);
-      gst_object_unref (plugin);
-    }
+static GstRegistry *
+gst_validate_registry_get (void)
+{
+  GstRegistry *registry;
 
-    g_free (filename);
+  g_mutex_lock (&_gst_validate_registry_mutex);
+  if (G_UNLIKELY (!_gst_validate_registry_default)) {
+    _gst_validate_registry_default = g_object_newv (GST_TYPE_REGISTRY, 0, NULL);
+    gst_object_ref_sink (GST_OBJECT_CAST (_gst_validate_registry_default));
   }
+  registry = _gst_validate_registry_default;
+  g_mutex_unlock (&_gst_validate_registry_mutex);
 
-  g_dir_close (dir);
-
-  return changed;
-
+  return registry;
 }
 
-
 static void
 gst_validate_init_plugins (void)
 {
+  GstRegistry *registry;
   const gchar *plugin_path;
 
+  gst_registry_fork_set_enabled (FALSE);
+  registry = gst_validate_registry_get ();
+
   plugin_path = g_getenv ("GST_VALIDATE_PLUGIN_PATH");
   if (plugin_path) {
     char **list;
@@ -104,7 +76,7 @@ gst_validate_init_plugins (void)
     GST_DEBUG ("GST_VALIDATE_PLUGIN_PATH set to %s", plugin_path);
     list = g_strsplit (plugin_path, G_SEARCHPATH_SEPARATOR_S, 0);
     for (i = 0; list[i]; i++) {
-      gst_validate_scan_path_for_plugins (list[i]);
+      gst_registry_scan_path (registry, list[i]);
     }
     g_strfreev (list);
   } else {
@@ -120,7 +92,7 @@ gst_validate_init_plugins (void)
         "gstreamer-" GST_API_VERSION, "plugins", NULL);
 
     GST_DEBUG ("scanning home plugins %s", home_plugins);
-    gst_validate_scan_path_for_plugins (home_plugins);
+    gst_registry_scan_path (registry, home_plugins);
     g_free (home_plugins);
 
     /* add the main (installed) library path */
@@ -141,15 +113,16 @@ gst_validate_init_plugins (void)
           "lib", "gstreamer-" GST_API_VERSION, NULL);
       GST_DEBUG ("scanning DLL dir %s", dir);
 
-      gst_validate_scan_path_for_plugins (dir);
+      gst_registry_scan_path (registry, dir);
 
       g_free (dir);
       g_free (base_dir);
     }
 #else
-    gst_validate_scan_path_for_plugins (PLUGINDIR);
+    gst_registry_scan_path (registry, PLUGINDIR);
 #endif
   }
+  gst_registry_fork_set_enabled (TRUE);
 }
 
 /**