From 166f6e1cc5dafc3e0e7cd2af6350d23becb475d1 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 27 Jan 2012 15:32:18 +0100 Subject: [PATCH] trace: make alloc trace work for miniobject again --- gst/gst.c | 1 + gst/gst_private.h | 1 + gst/gstminiobject.c | 14 ++++++++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gst/gst.c b/gst/gst.c index 84b9552..f24d258 100644 --- a/gst/gst.c +++ b/gst/gst.c @@ -638,6 +638,7 @@ init_post (GOptionContext * context, GOptionGroup * group, gpointer data, llf = G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_ERROR | G_LOG_FLAG_FATAL; g_log_set_handler (g_log_domain_gstreamer, llf, debug_log_handler, NULL); + _priv_gst_mini_object_initialize (); _priv_gst_quarks_initialize (); _priv_gst_memory_initialize (); _priv_gst_format_initialize (); diff --git a/gst/gst_private.h b/gst/gst_private.h index dd93110..2e69809 100644 --- a/gst/gst_private.h +++ b/gst/gst_private.h @@ -94,6 +94,7 @@ gboolean _priv_gst_in_valgrind (void); /* init functions called from gst_init(). */ void _priv_gst_quarks_initialize (void); +void _priv_gst_mini_object_initialize (void); void _priv_gst_buffer_initialize (void); void _priv_gst_buffer_list_initialize (void); void _priv_gst_structure_initialize (void); diff --git a/gst/gstminiobject.c b/gst/gstminiobject.c index 78749dd..2a42b61 100644 --- a/gst/gstminiobject.c +++ b/gst/gstminiobject.c @@ -38,8 +38,6 @@ #include "gst/gstinfo.h" #include -#define GST_DISABLE_TRACE - #ifndef GST_DISABLE_TRACE #include "gsttrace.h" static GstAllocTrace *_gst_mini_object_trace; @@ -48,6 +46,14 @@ static GstAllocTrace *_gst_mini_object_trace; /* Mutex used for weak referencing */ G_LOCK_DEFINE_STATIC (weak_refs_mutex); +void +_priv_gst_mini_object_initialize (void) +{ +#ifndef GST_DISABLE_TRACE + _gst_mini_object_trace = gst_alloc_trace_register ("GstMiniObject"); +#endif +} + /** * gst_mini_object_init: * @mini_object: a #GstMiniObject @@ -69,6 +75,10 @@ gst_mini_object_init (GstMiniObject * mini_object, GType type, gsize size) mini_object->size = size; mini_object->n_weak_refs = 0; mini_object->weak_refs = NULL; + +#ifndef GST_DISABLE_TRACE + gst_alloc_trace_new (_gst_mini_object_trace, mini_object); +#endif } /** -- 2.7.4