Merge branch 'new-sysprof' into 'master'

Port profiling to sysprof-collector api

See merge request GNOME/gtk!2457

1 files changed, 6 insertions, 4 deletions

diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index f86aa869b1..78385499a9 100644
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -2168,7 +2168,7 @@ _gtk_builder_parser_parse_buffer (GtkBuilder   *builder,
   const char * domain;
   ParserData data;
   GSList *l;
-  gint64 before = g_get_monotonic_time ();
+  gint64 before = GDK_PROFILER_CURRENT_TIME;
 
   /* Store the original domain so that interface domain attribute can be
    * applied for the builder and the original domain can be restored after
@@ -2246,8 +2246,10 @@ _gtk_builder_parser_parse_buffer (GtkBuilder   *builder,
 
   if (GDK_PROFILER_IS_RUNNING)
     {
-      guint64 after = g_get_monotonic_time ();
-      if (after - before > 500)
-        gdk_profiler_add_mark (before, after - before, "builder load", filename);
+      guint64 after = GDK_PROFILER_CURRENT_TIME;
+      if (after - before > 500000) /* half a millisecond */
+        {
+          gdk_profiler_add_mark (before, after - before, "builder load", filename);
+        }
     }
 }