From 714ea372827acce932a26c5ebe77537a0fb8c34f Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed, 20 Jul 2016 12:22:10 +0200
Subject: [PATCH] tracers: leaks: update type filter later for unknown types

This allow us to filter using an object type which is implemented
by a plugin like, say, GstGtkGLSink.

https://bugzilla.gnome.org/show_bug.cgi?id=768989
---
 plugins/tracers/gstleaks.c | 33 ++++++++++++++++++++++++++++++++-
 plugins/tracers/gstleaks.h |  6 ++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/plugins/tracers/gstleaks.c b/plugins/tracers/gstleaks.c
index 736359b..fe9c295 100644
--- a/plugins/tracers/gstleaks.c
+++ b/plugins/tracers/gstleaks.c
@@ -85,7 +85,17 @@ set_filtering (GstLeaksTracer * self)
 
     type = g_type_from_name (tmp[i]);
     if (type == 0) {
-      GST_WARNING_OBJECT (self, "unknown type %s", tmp[i]);
+      /* The type may not yet be known by the type system, typically because
+       * the plugin implementing it as not yet be loaded. Save it for now as
+       * it will have another chance to be added to the filter later in
+       * should_handle_object_type() when/if the object type is actually
+       * used. */
+      if (!self->unhandled_filter)
+        self->unhandled_filter = g_hash_table_new (NULL, NULL);
+
+      g_hash_table_add (self->unhandled_filter,
+          GUINT_TO_POINTER (g_quark_from_string (tmp[i])));
+      g_atomic_int_inc (&self->unhandled_filter_count);
       continue;
     }
 
@@ -107,6 +117,26 @@ should_handle_object_type (GstLeaksTracer * self, GType object_type)
     /* No filtering, handle all types */
     return TRUE;
 
+  if (g_atomic_int_get (&self->unhandled_filter_count)) {
+    GST_OBJECT_LOCK (self);
+    if (self->unhandled_filter) {
+      GQuark q;
+
+      q = g_type_qname (object_type);
+      if (g_hash_table_contains (self->unhandled_filter, GUINT_TO_POINTER (q))) {
+        g_array_append_val (self->filter, object_type);
+        g_hash_table_remove (self->unhandled_filter, GUINT_TO_POINTER (q));
+
+        if (g_atomic_int_dec_and_test (&self->unhandled_filter_count))
+          g_clear_pointer (&self->unhandled_filter, g_hash_table_unref);
+
+        GST_OBJECT_UNLOCK (self);
+        return TRUE;
+      }
+    }
+    GST_OBJECT_UNLOCK (self);
+  }
+
   len = self->filter->len;
   for (i = 0; i < len; i++) {
     GType type = g_array_index (self->filter, GType, i);
@@ -479,6 +509,7 @@ gst_leaks_tracer_finalize (GObject * object)
     g_array_free (self->filter, TRUE);
   g_clear_pointer (&self->added, g_hash_table_unref);
   g_clear_pointer (&self->removed, g_hash_table_unref);
+  g_clear_pointer (&self->unhandled_filter, g_hash_table_unref);
 
   g_queue_remove (&instances, self);
 
diff --git a/plugins/tracers/gstleaks.h b/plugins/tracers/gstleaks.h
index 513ae95..6dd3def 100644
--- a/plugins/tracers/gstleaks.h
+++ b/plugins/tracers/gstleaks.h
@@ -60,6 +60,12 @@ struct _GstLeaksTracer {
   GHashTable *added;
   /* Set of owned ObjectLog.  Protected by object lock */
   GHashTable *removed;
+  /* If not NULL, contain a set of GQuark representing type filter not
+   * (yet?) known by the type system.
+   * Protected by object lock. */
+  GHashTable *unhandled_filter;
+  /* The number of elements in unhandled_filter */
+  gint unhandled_filter_count;
   gboolean done;
 
   gboolean log_stack_trace;
-- 
2.7.4