validate: Use g_object_{get|set}_qdata where applicable

This provides a substantial speedup compared to using strings

diff --git a/validate/gst/validate/gst-validate-internal.h b/validate/gst/validate/gst-validate-internal.h
index 35c9cfc..7a64c5c 100644 (file)
--- a/validate/gst/validate/gst-validate-internal.h
+++ b/validate/gst/validate/gst-validate-internal.h
@@ -33,6 +33,7 @@ extern G_GNUC_INTERNAL GstDebugCategory *gstvalidate_debug;
 extern G_GNUC_INTERNAL GRegex *newline_regex;
 extern G_GNUC_INTERNAL GstClockTime _priv_start_time;
 
+GQuark _Q_VALIDATE_MONITOR;
 
 /* If an action type is 1 (TRUE) we also consider it is a config to keep backward compatibility */
 #define IS_CONFIG_ACTION_TYPE(type) (((type) & GST_VALIDATE_ACTION_TYPE_CONFIG) || ((type) == TRUE))

diff --git a/validate/gst/validate/gst-validate-pad-monitor.c b/validate/gst/validate/gst-validate-pad-monitor.c
index 3dbcb97..79d98f2 100644 (file)
--- a/validate/gst/validate/gst-validate-pad-monitor.c
+++ b/validate/gst/validate/gst-validate-pad-monitor.c
@@ -39,6 +39,8 @@
  *
  * TODO
  */
+#define _GET_PAD_MONITOR(p) g_object_get_qdata ((GObject*) p, _Q_VALIDATE_MONITOR)
+#define _SET_PAD_MONITOR(p,d) g_object_set_qdata ((GObject*) p, _Q_VALIDATE_MONITOR, d)
 
 static GstValidateInterceptionReturn
 gst_validate_pad_monitor_intercept_report (GstValidateReporter * reporter,
@@ -160,7 +162,7 @@ _find_master_report_on_pad (GstPad * pad, GstValidateReport * report)
     return FALSE;
   }
 
-  pad_monitor = g_object_get_data ((GObject *) pad, "validate-monitor");
+  pad_monitor = _GET_PAD_MONITOR (pad);
 
   /* For some reason this pad isn't monitored */
   if (pad_monitor == NULL)
@@ -1172,8 +1174,7 @@ static void
         otherpad = g_value_get_object (&value);
         GST_DEBUG_OBJECT (pad, "Checking pad %s:%s input timestamps",
             GST_DEBUG_PAD_NAME (otherpad));
-        othermonitor =
-            g_object_get_data ((GObject *) otherpad, "validate-monitor");
+        othermonitor = _GET_PAD_MONITOR (otherpad);
         GST_VALIDATE_MONITOR_LOCK (othermonitor);
         if (gst_validate_pad_monitor_timestamp_is_in_received_range
             (othermonitor, ts, tolerance)
@@ -1344,8 +1345,7 @@ gst_validate_pad_monitor_check_aggregated_return (GstValidatePadMonitor *
         otherpad = g_value_get_object (&value);
         peerpad = gst_pad_get_peer (otherpad);
         if (peerpad) {
-          othermonitor =
-              g_object_get_data ((GObject *) peerpad, "validate-monitor");
+          othermonitor = _GET_PAD_MONITOR (peerpad);
           if (othermonitor) {
             found_a_pad = TRUE;
             GST_VALIDATE_MONITOR_LOCK (othermonitor);
@@ -1445,8 +1445,7 @@ static void
     switch (gst_iterator_next (iter, &value)) {
       case GST_ITERATOR_OK:
         otherpad = g_value_get_object (&value);
-        othermonitor =
-            g_object_get_data ((GObject *) otherpad, "validate-monitor");
+        othermonitor = _GET_PAD_MONITOR (otherpad);
         if (othermonitor) {
           SerializedEventData *data = g_slice_new0 (SerializedEventData);
           data->timestamp = last_ts;
@@ -1507,8 +1506,7 @@ gst_validate_pad_monitor_otherpad_add_pending_field (GstValidatePadMonitor *
     switch (gst_iterator_next (iter, &value)) {
       case GST_ITERATOR_OK:
         otherpad = g_value_get_object (&value);
-        othermonitor =
-            g_object_get_data ((GObject *) otherpad, "validate-monitor");
+        othermonitor = _GET_PAD_MONITOR (otherpad);
         if (othermonitor) {
           GST_VALIDATE_MONITOR_LOCK (othermonitor);
           g_assert (othermonitor->pending_setcaps_fields != NULL);
@@ -1561,8 +1559,7 @@ gst_validate_pad_monitor_otherpad_clear_pending_fields (GstValidatePadMonitor *
     switch (gst_iterator_next (iter, &value)) {
       case GST_ITERATOR_OK:
         otherpad = g_value_get_object (&value);
-        othermonitor =
-            g_object_get_data ((GObject *) otherpad, "validate-monitor");
+        othermonitor = _GET_PAD_MONITOR (otherpad);
         if (othermonitor) {
           GST_VALIDATE_MONITOR_LOCK (othermonitor);
           g_assert (othermonitor->pending_setcaps_fields != NULL);
@@ -1616,8 +1613,7 @@ gst_validate_pad_monitor_add_expected_newsegment (GstValidatePadMonitor *
         otherpad = g_value_get_object (&value);
         if (!otherpad)
           continue;
-        othermonitor =
-            g_object_get_data ((GObject *) otherpad, "validate-monitor");
+        othermonitor = _GET_PAD_MONITOR (otherpad);
         GST_VALIDATE_MONITOR_LOCK (othermonitor);
         gst_event_replace (&othermonitor->expected_segment, event);
         GST_VALIDATE_MONITOR_UNLOCK (othermonitor);
@@ -1721,8 +1717,7 @@ mark_pads_eos (GstValidatePadMonitor * pad_monitor)
   pad_monitor->is_eos = TRUE;
   if (peer) {
     real_peer = _get_actual_pad (peer);
-    peer_monitor =
-        g_object_get_data ((GObject *) real_peer, "validate-monitor");
+    peer_monitor = _GET_PAD_MONITOR (real_peer);
     if (peer_monitor)
       peer_monitor->is_eos = TRUE;
     gst_object_unref (peer);
@@ -2248,8 +2243,7 @@ static GstFlowReturn
 gst_validate_pad_monitor_chain_func (GstPad * pad, GstObject * parent,
     GstBuffer * buffer)
 {
-  GstValidatePadMonitor *pad_monitor =
-      g_object_get_data ((GObject *) pad, "validate-monitor");
+  GstValidatePadMonitor *pad_monitor = _GET_PAD_MONITOR (pad);
   GstFlowReturn ret;
 
   GST_VALIDATE_PAD_MONITOR_PARENT_LOCK (pad_monitor);
@@ -2311,13 +2305,14 @@ static GstFlowReturn
 gst_validate_pad_monitor_sink_event_full_func (GstPad * pad, GstObject * parent,
     GstEvent * event)
 {
-  GstValidatePadMonitor *pad_monitor =
-      g_object_get_data ((GObject *) pad, "validate-monitor");
+  GstValidatePadMonitor *pad_monitor = _GET_PAD_MONITOR (pad);
   GstFlowReturn ret;
 
   GST_VALIDATE_PAD_MONITOR_PARENT_LOCK (pad_monitor);
   GST_VALIDATE_MONITOR_LOCK (pad_monitor);
 
+  GST_DEBUG_OBJECT (pad, "event %p %s", event, GST_EVENT_TYPE_NAME (event));
+
   if (gst_validate_pad_monitor_event_is_tracked (pad_monitor, event)) {
     GstClockTime last_ts = GST_CLOCK_TIME_NONE;
     if (GST_CLOCK_TIME_IS_VALID (pad_monitor->current_timestamp)) {
@@ -2353,8 +2348,7 @@ static gboolean
 gst_validate_pad_monitor_src_event_func (GstPad * pad, GstObject * parent,
     GstEvent * event)
 {
-  GstValidatePadMonitor *pad_monitor =
-      g_object_get_data ((GObject *) pad, "validate-monitor");
+  GstValidatePadMonitor *pad_monitor = _GET_PAD_MONITOR (pad);
   gboolean ret;
 
   GST_VALIDATE_MONITOR_LOCK (pad_monitor);
@@ -2368,8 +2362,7 @@ static gboolean
 gst_validate_pad_monitor_query_func (GstPad * pad, GstObject * parent,
     GstQuery * query)
 {
-  GstValidatePadMonitor *pad_monitor =
-      g_object_get_data ((GObject *) pad, "validate-monitor");
+  GstValidatePadMonitor *pad_monitor = _GET_PAD_MONITOR (pad);
   gboolean ret;
 
   gst_validate_pad_monitor_query_overrides (pad_monitor, query);
@@ -2430,8 +2423,7 @@ static gboolean
 gst_validate_pad_monitor_activatemode_func (GstPad * pad, GstObject * parent,
     GstPadMode mode, gboolean active)
 {
-  GstValidatePadMonitor *pad_monitor =
-      g_object_get_data ((GObject *) pad, "validate-monitor");
+  GstValidatePadMonitor *pad_monitor = _GET_PAD_MONITOR (pad);
   gboolean ret = TRUE;
 
   /* TODO add overrides for activate func */
@@ -2452,9 +2444,9 @@ static GstFlowReturn
 gst_validate_pad_get_range_func (GstPad * pad, GstObject * parent,
     guint64 offset, guint size, GstBuffer ** buffer)
 {
-  GstValidatePadMonitor *pad_monitor =
-      g_object_get_data ((GObject *) pad, "validate-monitor");
+  GstValidatePadMonitor *pad_monitor = _GET_PAD_MONITOR (pad);
   GstFlowReturn ret;
+
   ret = pad_monitor->getrange_func (pad, parent, offset, size, buffer);
   return ret;
 }
@@ -2780,14 +2772,14 @@ gst_validate_pad_monitor_do_setup (GstValidateMonitor * monitor)
     return FALSE;
   }
 
-  if (g_object_get_data ((GObject *) pad, "validate-monitor")) {
+  if (_GET_PAD_MONITOR (pad)) {
     GST_WARNING_OBJECT (pad_monitor,
         "Pad already has a validate-monitor associated");
     gst_object_unref (pad);
     return FALSE;
   }
 
-  g_object_set_data ((GObject *) pad, "validate-monitor", pad_monitor);
+  _SET_PAD_MONITOR (pad, pad_monitor);
 
   pad_monitor->event_func = GST_PAD_EVENTFUNC (pad);
   pad_monitor->event_full_func = GST_PAD_EVENTFULLFUNC (pad);

diff --git a/validate/gst/validate/validate.c b/validate/gst/validate/validate.c
index db640b1..61ee313 100644 (file)
--- a/validate/gst/validate/validate.c
+++ b/validate/gst/validate/validate.c
@@ -299,6 +299,7 @@ gst_validate_init (void)
       "Validation library");
 
   _priv_start_time = gst_util_get_timestamp ();
+  _Q_VALIDATE_MONITOR = g_quark_from_static_string ("validate-monitor");
 
   /* init the report system (can be called multiple times) */
   gst_validate_report_init ();