mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-28 11:55:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate: turn GstValidateReport to a mini object

Browse source 
It handles refcounting for us and will enable automatic leak checks when
using the 'leaks' tracer.

Differential Revision: https://phabricator.freedesktop.org/D1233
This commit is contained in:
Guillaume Desmottes 2016-05-26 14:02:45 +02:00 committed by Thibault Saunier
parent c8a3d6c607
commit 8708215ce5
3 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
validate/gst/validate/gst-validate-report.c
View file

@ -43,6 +43,8 @@ static GstValidateDebugFlags _gst_validate_flags = 0;
static GHashTable *_gst_validate_issues = NULL;
static FILE **log_files = NULL;
GType _gst_validate_report_type;
GST_DEFINE_MINI_OBJECT_TYPE (GstValidateReport, gst_validate_report);
GRegex *newline_regex = NULL;
@ -60,10 +62,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_validate_report_debug);
(g_mutex_unlock (&((GstValidateReport *) r)->shadow_reports_lock)); \
} G_STMT_END
G_DEFINE_BOXED_TYPE (GstValidateReport, gst_validate_report,
(GBoxedCopyFunc) gst_validate_report_ref,
(GBoxedFreeFunc) gst_validate_report_unref);
static GstValidateIssue *
gst_validate_issue_ref (GstValidateIssue * issue)
{
@ -363,6 +361,8 @@ gst_validate_report_init (void)
GST_DEBUG_CATEGORY_INIT (gst_validate_report_debug, "gstvalidatereport",
GST_DEBUG_FG_YELLOW, "Gst validate reporting");
_gst_validate_report_type = gst_validate_report_get_type ();
if (_gst_validate_report_start_time == 0) {
_gst_validate_report_start_time = gst_util_get_timestamp ();
@ -505,13 +505,29 @@ gst_validate_report_get_issue_id (GstValidateReport * report)
return gst_validate_issue_get_id (report->issue);
}
static void
_report_free (GstValidateReport * report)
{
g_object_unref (report->reporter);
g_free (report->message);
g_list_free_full (report->shadow_reports,
(GDestroyNotify) gst_validate_report_unref);
g_list_free_full (report->repeated_reports,
(GDestroyNotify) gst_validate_report_unref);
g_mutex_clear (&report->shadow_reports_lock);
g_slice_free (GstValidateReport, report);
}
GstValidateReport *
gst_validate_report_new (GstValidateIssue * issue,
GstValidateReporter * reporter, const gchar * message)
{
GstValidateReport *report = g_slice_new0 (GstValidateReport);
report->refcount = 1;
gst_mini_object_init (((GstMiniObject *) report), 0,
_gst_validate_report_type, NULL, NULL,
(GstMiniObjectFreeFunction) _report_free);
report->issue = issue;
report->reporter = g_object_ref (reporter);
report->message = g_strdup (message);
@ -527,28 +543,13 @@ gst_validate_report_new (GstValidateIssue * issue,
void
gst_validate_report_unref (GstValidateReport * report)
{
g_return_if_fail (report != NULL);
if (G_UNLIKELY (g_atomic_int_dec_and_test (&report->refcount))) {
g_object_unref (report->reporter);
g_free (report->message);
g_list_free_full (report->shadow_reports,
(GDestroyNotify) gst_validate_report_unref);
g_list_free_full (report->repeated_reports,
(GDestroyNotify) gst_validate_report_unref);
g_mutex_clear (&report->shadow_reports_lock);
g_slice_free (GstValidateReport, report);
}
gst_mini_object_unref (GST_MINI_OBJECT (report));
}
GstValidateReport *
gst_validate_report_ref (GstValidateReport * report)
{
g_return_val_if_fail (report != NULL, NULL);
g_atomic_int_inc (&report->refcount);
return report;
return (GstValidateReport *) gst_mini_object_ref (GST_MINI_OBJECT (report));
}
void

2
validate/gst/validate/gst-validate-report.h
View file

@ -151,7 +151,7 @@ typedef struct {
GType gst_validate_issue_get_type (void);
struct _GstValidateReport {
gint refcount;
GstMiniObject mini_object;
/* issue: The issue this report corresponds to (to get description, summary,...) */
GstValidateIssue *issue;

3
validate/tests/check/validate/padmonitor.c
View file

@ -78,8 +78,7 @@ _check_reports_refcount (GstPad * pad, gint refcount)
refcount += 1;
for (tmp = reports; tmp; tmp = tmp->next)
fail_unless_equals_int (((GstValidateReport *) tmp->data)->refcount,
refcount);
fail_unless_equals_int (((GstMiniObject *) tmp->data)->refcount, refcount);
g_list_free_full (reports, (GDestroyNotify) gst_validate_report_unref);
}