benchmarks: use gst_util_get_timestamp() instead of own implementation

diff --git a/tests/benchmarks/caps.c b/tests/benchmarks/caps.c
index 98187ad..000e46f 100644 (file)
--- a/tests/benchmarks/caps.c
+++ b/tests/benchmarks/caps.c
@@ -36,16 +36,6 @@
   "signed = (boolean) { true, false }"
 
 
-static GstClockTime
-gst_get_current_time (void)
-{
-  GTimeVal tv;
-
-  g_get_current_time (&tv);
-  return GST_TIMEVAL_TO_TIME (tv);
-}
-
-
 gint
 main (gint argc, gchar * argv[])
 {
@@ -58,18 +48,18 @@ main (gint argc, gchar * argv[])
 
   protocaps = gst_caps_from_string (GST_AUDIO_INT_PAD_TEMPLATE_CAPS);
 
-  start = gst_get_current_time ();
+  start = gst_util_get_timestamp ();
   capses = g_new (GstCaps *, NUM_CAPS);
   for (i = 0; i < NUM_CAPS; i++)
     capses[i] = gst_caps_copy (protocaps);
-  end = gst_get_current_time ();
+  end = gst_util_get_timestamp ();
   g_print ("%" GST_TIME_FORMAT " - creating %d caps\n",
       GST_TIME_ARGS (end - start), i);
 
-  start = gst_get_current_time ();
+  start = gst_util_get_timestamp ();
   for (i = 0; i < NUM_CAPS; i++)
     gst_caps_unref (capses[i]);
-  end = gst_get_current_time ();
+  end = gst_util_get_timestamp ();
   g_print ("%" GST_TIME_FORMAT " - destroying %d caps\n",
       GST_TIME_ARGS (end - start), i);
 

diff --git a/tests/benchmarks/complexity.c b/tests/benchmarks/complexity.c
index d1ed522..ee5359d 100644 (file)
--- a/tests/benchmarks/complexity.c
+++ b/tests/benchmarks/complexity.c
@@ -26,15 +26,6 @@
 #define SINK_ELEMENT "fakesink"
 
 
-static GstClockTime
-gst_get_current_time (void)
-{
-  GTimeVal tv;
-
-  g_get_current_time (&tv);
-  return GST_TIMEVAL_TO_TIME (tv);
-}
-
 gint
 main (gint argc, gchar * argv[])
 {
@@ -55,7 +46,7 @@ main (gint argc, gchar * argv[])
   complexity_order = atoi (argv[1]);
   n_elements = atoi (argv[2]);
 
-  start = gst_get_current_time ();
+  start = gst_util_get_timestamp ();
 
   pipeline = gst_element_factory_make ("pipeline", NULL);
   g_assert (pipeline);
@@ -108,40 +99,40 @@ main (gint argc, gchar * argv[])
   g_slist_free (saved_src_list);
   g_slist_free (new_src_list);
 
-  end = gst_get_current_time ();
+  end = gst_util_get_timestamp ();
   g_print ("%" GST_TIME_FORMAT " - creating and linking %d elements\n",
       GST_TIME_ARGS (end - start), i);
 
-  start = gst_get_current_time ();
+  start = gst_util_get_timestamp ();
   if (gst_element_set_state (pipeline,
           GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE)
     g_assert_not_reached ();
   if (gst_element_get_state (pipeline, NULL, NULL,
           GST_CLOCK_TIME_NONE) == GST_STATE_CHANGE_FAILURE)
     g_assert_not_reached ();
-  end = gst_get_current_time ();
+  end = gst_util_get_timestamp ();
   g_print ("%" GST_TIME_FORMAT " - setting pipeline to playing\n",
       GST_TIME_ARGS (end - start));
 
-  start = gst_get_current_time ();
+  start = gst_util_get_timestamp ();
   msg = gst_bus_poll (gst_element_get_bus (pipeline),
       GST_MESSAGE_EOS | GST_MESSAGE_ERROR, -1);
-  end = gst_get_current_time ();
+  end = gst_util_get_timestamp ();
   gst_message_unref (msg);
   g_print ("%" GST_TIME_FORMAT " - putting %u buffers through\n",
       GST_TIME_ARGS (end - start), BUFFER_COUNT);
 
-  start = gst_get_current_time ();
+  start = gst_util_get_timestamp ();
   if (gst_element_set_state (pipeline,
           GST_STATE_NULL) != GST_STATE_CHANGE_SUCCESS)
     g_assert_not_reached ();
-  end = gst_get_current_time ();
+  end = gst_util_get_timestamp ();
   g_print ("%" GST_TIME_FORMAT " - setting pipeline to NULL\n",
       GST_TIME_ARGS (end - start));
 
-  start = gst_get_current_time ();
+  start = gst_util_get_timestamp ();
   g_object_unref (pipeline);
-  end = gst_get_current_time ();
+  end = gst_util_get_timestamp ();
   g_print ("%" GST_TIME_FORMAT " - unreffing pipeline\n",
       GST_TIME_ARGS (end - start));
 

diff --git a/tests/benchmarks/gstbufferstress.c b/tests/benchmarks/gstbufferstress.c
index aa08bb9..100259a 100644 (file)
--- a/tests/benchmarks/gstbufferstress.c
+++ b/tests/benchmarks/gstbufferstress.c
@@ -26,14 +26,6 @@
 static guint64 nbbuffers;
 static GMutex *mutex;
 
-static GstClockTime
-gst_get_current_time (void)
-{
-  GTimeVal tv;
-
-  g_get_current_time (&tv);
-  return GST_TIMEVAL_TO_TIME (tv);
-}
 
 static void *
 run_test (void *user_data)
@@ -46,14 +38,14 @@ run_test (void *user_data)
   g_mutex_lock (mutex);
   g_mutex_unlock (mutex);
 
-  start = gst_get_current_time ();
+  start = gst_util_get_timestamp ();
 
   for (nb = nbbuffers; nb; nb--) {
     buf = gst_buffer_new ();
     gst_buffer_unref (buf);
   }
 
-  end = gst_get_current_time ();
+  end = gst_util_get_timestamp ();
   g_print ("total %" GST_TIME_FORMAT " - average %" GST_TIME_FORMAT
       "  - Thread %d\n", GST_TIME_ARGS (end - start),
       GST_TIME_ARGS ((end - start) / nbbuffers), threadid);
@@ -99,7 +91,7 @@ main (gint argc, gchar * argv[])
   }
 
   /* Signal all threads to start */
-  start = gst_get_current_time ();
+  start = gst_util_get_timestamp ();
   g_mutex_unlock (mutex);
 
   for (t = 0; t < num_threads; t++) {
@@ -107,7 +99,7 @@ main (gint argc, gchar * argv[])
       g_thread_join (threads[t]);
   }
 
-  end = gst_get_current_time ();
+  end = gst_util_get_timestamp ();
   g_print ("*** total %" GST_TIME_FORMAT " - average %" GST_TIME_FORMAT
       "  - Done creating %" G_GUINT64_FORMAT " buffers\n",
       GST_TIME_ARGS (end - start),

diff --git a/tests/benchmarks/mass-elements.c b/tests/benchmarks/mass-elements.c
index f753ceb..826d3d0 100644 (file)
--- a/tests/benchmarks/mass-elements.c
+++ b/tests/benchmarks/mass-elements.c
@@ -26,15 +26,6 @@
 #define SINK_ELEMENT "fakesink"
 
 
-static GstClockTime
-gst_get_current_time (void)
-{
-  GTimeVal tv;
-
-  g_get_current_time (&tv);
-  return GST_TIMEVAL_TO_TIME (tv);
-}
-
 gint
 main (gint argc, gchar * argv[])
 {
@@ -58,7 +49,7 @@ main (gint argc, gchar * argv[])
   g_print
       ("*** benchmarking this pipeline: %s num-buffers=%u ! %u * identity ! %s\n",
       src_name, buffers, identities, sink_name);
-  start = gst_get_current_time ();
+  start = gst_util_get_timestamp ();
   pipeline = gst_element_factory_make ("pipeline", NULL);
   g_assert (pipeline);
   src = gst_element_factory_make (src_name, NULL);
@@ -86,40 +77,40 @@ main (gint argc, gchar * argv[])
   }
   if (!gst_element_link (last, sink))
     g_assert_not_reached ();
-  end = gst_get_current_time ();
+  end = gst_util_get_timestamp ();
   g_print ("%" GST_TIME_FORMAT " - creating %u identity elements\n",
       GST_TIME_ARGS (end - start), identities);
 
-  start = gst_get_current_time ();
+  start = gst_util_get_timestamp ();
   if (gst_element_set_state (pipeline,
           GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE)
     g_assert_not_reached ();
   if (gst_element_get_state (pipeline, NULL, NULL,
           GST_CLOCK_TIME_NONE) == GST_STATE_CHANGE_FAILURE)
     g_assert_not_reached ();
-  end = gst_get_current_time ();
+  end = gst_util_get_timestamp ();
   g_print ("%" GST_TIME_FORMAT " - setting pipeline to playing\n",
       GST_TIME_ARGS (end - start));
 
-  start = gst_get_current_time ();
+  start = gst_util_get_timestamp ();
   msg = gst_bus_poll (gst_element_get_bus (pipeline),
       GST_MESSAGE_EOS | GST_MESSAGE_ERROR, -1);
-  end = gst_get_current_time ();
+  end = gst_util_get_timestamp ();
   gst_message_unref (msg);
   g_print ("%" GST_TIME_FORMAT " - putting %u buffers through\n",
       GST_TIME_ARGS (end - start), buffers);
 
-  start = gst_get_current_time ();
+  start = gst_util_get_timestamp ();
   if (gst_element_set_state (pipeline,
           GST_STATE_NULL) != GST_STATE_CHANGE_SUCCESS)
     g_assert_not_reached ();
-  end = gst_get_current_time ();
+  end = gst_util_get_timestamp ();
   g_print ("%" GST_TIME_FORMAT " - setting pipeline to NULL\n",
       GST_TIME_ARGS (end - start));
 
-  start = gst_get_current_time ();
+  start = gst_util_get_timestamp ();
   g_object_unref (pipeline);
-  end = gst_get_current_time ();
+  end = gst_util_get_timestamp ();
   g_print ("%" GST_TIME_FORMAT " - unreffing pipeline\n",
       GST_TIME_ARGS (end - start));