mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 15:27:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate-runner: switch to using a GList for the reports.

Browse source 
+ Return a copy of that list in get_reports.
+ update tests.
This commit is contained in:
Mathieu Duponchelle 2014-09-30 10:30:24 +02:00 committed by Mathieu Duponchelle
parent 1f1cf83af8
commit 8cfffb4a3a
3 changed files with 41 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
validate/gst/validate/gst-validate-runner.c
View file

@ -59,7 +59,7 @@
struct _GstValidateRunnerPrivate
{
GMutex mutex;
GSList *reports;
GList *reports;
};
#define GST_VALIDATE_RUNNER_LOCK(r) \
@ -94,7 +94,7 @@ gst_validate_runner_dispose (GObject * object)
{
GstValidateRunner *runner = GST_VALIDATE_RUNNER_CAST (object);
g_slist_free_full (runner->priv->reports,
g_list_free_full (runner->priv->reports,
(GDestroyNotify) gst_validate_report_unref);
g_mutex_clear (&runner->priv->mutex);
@ -145,7 +145,7 @@ gst_validate_runner_add_report (GstValidateRunner * runner,
GstValidateReport * report)
{
GST_VALIDATE_RUNNER_LOCK (runner);
runner->priv->reports = g_slist_prepend (runner->priv->reports, report);
runner->priv->reports = g_list_append (runner->priv->reports, report);
GST_VALIDATE_RUNNER_UNLOCK (runner);
g_signal_emit (runner, _signals[REPORT_ADDED_SIGNAL], 0, report);
@ -167,19 +167,19 @@ gst_validate_runner_get_reports_count (GstValidateRunner * runner)
g_return_val_if_fail (runner != NULL, 0);
GST_VALIDATE_RUNNER_LOCK (runner);
l = g_slist_length (runner->priv->reports);
l = g_list_length (runner->priv->reports);
GST_VALIDATE_RUNNER_UNLOCK (runner);
return l;
}
GSList *
GList *
gst_validate_runner_get_reports (GstValidateRunner * runner)
{
GSList *ret;
GList *ret;
GST_VALIDATE_RUNNER_LOCK (runner);
ret = g_slist_reverse (runner->priv->reports);
ret = g_list_copy_deep (runner->priv->reports, (GCopyFunc) gst_validate_report_ref, NULL);
GST_VALIDATE_RUNNER_UNLOCK (runner);
return ret;
@ -199,12 +199,13 @@ gst_validate_runner_get_reports (GstValidateRunner * runner)
int
gst_validate_runner_printf (GstValidateRunner * runner)
{
GSList *tmp;
GList *reports, *tmp;
guint count = 0;
int ret = 0;
GList *criticals = NULL;
for (tmp = gst_validate_runner_get_reports (runner); tmp; tmp = tmp->next) {
reports = gst_validate_runner_get_reports (runner);
for (tmp = reports; tmp; tmp = tmp->next) {
GstValidateReport *report = tmp->data;
if (gst_validate_report_should_print (report))
@ -229,6 +230,7 @@ gst_validate_runner_printf (GstValidateRunner * runner)
g_printerr ("\n");
}
gst_validate_printf (NULL, "Pipeline finished, issues found: %u\n", count);
g_list_free_full (reports, (GDestroyNotify) gst_validate_report_unref);
gst_validate_printf (NULL, "Issues found: %u\n", count);
return ret;
}

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

@ -74,7 +74,7 @@ GstValidateRunner * gst_validate_runner_new (void);
void gst_validate_runner_add_report (GstValidateRunner * runner, GstValidateReport * report);
guint gst_validate_runner_get_reports_count (GstValidateRunner * runner);
GSList * gst_validate_runner_get_reports (GstValidateRunner * runner);
GList * gst_validate_runner_get_reports (GstValidateRunner * runner);
int gst_validate_runner_printf (GstValidateRunner * runner);

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

@ -29,6 +29,7 @@ GST_START_TEST (buffer_before_segment)
GstValidateRunner *runner;
GstValidateReport *report;
GstValidateMonitor *monitor;
GList *reports;
/* getting an existing element class is cheating, but easier */
src = gst_element_factory_make ("fakesrc", "fakesrc");
@ -55,11 +56,13 @@ GST_START_TEST (buffer_before_segment)
fail_unless_equals_int (gst_pad_push (srcpad, gst_buffer_new ()),
GST_FLOW_OK);
assert_equals_int (g_slist_length (gst_validate_runner_get_reports(runner)), 1);
report = gst_validate_runner_get_reports (runner)->data;
reports = gst_validate_runner_get_reports (runner);
assert_equals_int (g_list_length (reports), 1);
report = reports->data;
fail_unless_equals_int (report->level, GST_VALIDATE_REPORT_LEVEL_WARNING);
fail_unless_equals_int (report->issue->issue_id,
GST_VALIDATE_ISSUE_ID_BUFFER_BEFORE_SEGMENT);
g_list_free_full (reports, (GDestroyNotify) gst_validate_report_unref);
}
/* Setup all needed event and push a new buffer (WORKS) */
@ -68,7 +71,9 @@ GST_START_TEST (buffer_before_segment)
gst_check_setup_events (srcpad, src, NULL, GST_FORMAT_TIME);
fail_unless_equals_int (gst_pad_push (srcpad, gst_buffer_new ()),
GST_FLOW_OK);
assert_equals_int (g_slist_length (gst_validate_runner_get_reports (runner)), 1);
reports = gst_validate_runner_get_reports (runner);
assert_equals_int (g_list_length (reports), 1);
g_list_free_full (reports, (GDestroyNotify) gst_validate_report_unref);
}
/* clean up */
@ -94,6 +99,7 @@ GST_START_TEST (buffer_outside_segment)
GstValidateReport *report;
GstValidateRunner *runner;
GstValidateMonitor *monitor;
GList *reports;
/* getting an existing element class is cheating, but easier */
src = gst_element_factory_make ("fakesrc", "fakesrc");
@ -136,17 +142,21 @@ GST_START_TEST (buffer_outside_segment)
GST_BUFFER_DURATION (buffer) = GST_SECOND;
fail_unless (gst_pad_push (srcpad, buffer));
assert_equals_int (g_slist_length (gst_validate_runner_get_reports (runner)), 1);
report = gst_validate_runner_get_reports (runner)->data;
reports = gst_validate_runner_get_reports (runner);
assert_equals_int (g_list_length (reports), 1);
report = reports->data;
fail_unless_equals_int (report->level, GST_VALIDATE_REPORT_LEVEL_ISSUE);
fail_unless_equals_int (report->issue->issue_id,
GST_VALIDATE_ISSUE_ID_BUFFER_IS_OUT_OF_SEGMENT);
g_list_free_full (reports, (GDestroyNotify) gst_validate_report_unref);
}
/* Pushing a buffer inside the segment */
{
fail_unless (gst_pad_push (srcpad, gst_buffer_new ()));
assert_equals_int (g_slist_length (gst_validate_runner_get_reports (runner)), 1);
reports = gst_validate_runner_get_reports (runner);
assert_equals_int (g_list_length (reports), 1);
g_list_free_full (reports, (GDestroyNotify) gst_validate_report_unref);
}
@ -175,6 +185,7 @@ _first_buffer_running_time (gboolean failing)
GstValidateReport *report;
GstValidateRunner *runner;
GstValidateMonitor *monitor;
GList *reports;
/* getting an existing element class is cheating, but easier */
src = gst_element_factory_make ("fakesrc", "fakesrc");
@ -205,15 +216,17 @@ _first_buffer_running_time (gboolean failing)
GST_BUFFER_DURATION (buffer) = GST_SECOND;
fail_unless (gst_pad_push (srcpad, buffer));
reports = gst_validate_runner_get_reports (runner);
if (failing) {
assert_equals_int (g_slist_length (gst_validate_runner_get_reports (runner)), 1);
report = gst_validate_runner_get_reports (runner)->data;
assert_equals_int (g_list_length (reports), 1);
report = reports->data;
fail_unless_equals_int (report->level, GST_VALIDATE_REPORT_LEVEL_WARNING);
fail_unless_equals_int (report->issue->issue_id,
GST_VALIDATE_ISSUE_ID_FIRST_BUFFER_RUNNING_TIME_IS_NOT_ZERO);
} else {
assert_equals_int (g_slist_length (gst_validate_runner_get_reports (runner)), 0);
assert_equals_int (g_list_length (reports), 0);
}
g_list_free_full (reports, (GDestroyNotify) gst_validate_report_unref);
}
/* clean up */
@ -286,6 +299,7 @@ _test_flow_aggregation (GstFlowReturn flow, GstFlowReturn flow1,
GstValidatePadMonitor *pmonitor, *pmonitor1, *pmonitor2;
GstElement *demuxer = fake_demuxer_new ();
GstBin *pipeline = GST_BIN (gst_pipeline_new ("validate-pipeline"));
GList *reports;
GstValidateRunner *runner = gst_validate_runner_new ();
GstValidateMonitor *monitor =
@ -316,17 +330,19 @@ _test_flow_aggregation (GstFlowReturn flow, GstFlowReturn flow1,
fail_unless_equals_int (gst_pad_push (srcpad, gst_buffer_new ()), demux_flow);
reports = gst_validate_runner_get_reports (runner);
if (should_fail) {
assert_equals_int (g_slist_length (gst_validate_runner_get_reports (runner)), 1);
report = gst_validate_runner_get_reports (runner)->data;
assert_equals_int (g_list_length (reports), 1);
report = reports->data;
fail_unless_equals_int (report->level, GST_VALIDATE_REPORT_LEVEL_CRITICAL);
fail_unless_equals_int (report->issue->issue_id,
GST_VALIDATE_ISSUE_ID_WRONG_FLOW_RETURN);
} else {
assert_equals_int (g_slist_length (gst_validate_runner_get_reports (runner)), 0);
assert_equals_int (g_list_length (reports), 0);
}
g_list_free_full (reports, (GDestroyNotify) gst_validate_report_unref);
clean_bus (GST_ELEMENT (pipeline));
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL);