[sysprof/wip/chergert/sysprof-3] libsysprof-ui: include samples, marks, and ctrset in events

[Christian Hergert <chergert src gnome org>]

commit 6cf6e50c93397478fb22f5a4fd43de87c40f2919
Author: Christian Hergert <chergert redhat com>
Date:   Mon May 20 17:52:46 2019 -0700

    libsysprof-ui: include samples, marks, and ctrset in events

 src/libsysprof-ui/sysprof-recording-state-view.c     | 7 ++++++-
 src/libsysprof-ui/ui/sysprof-recording-state-view.ui | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/src/libsysprof-ui/sysprof-recording-state-view.c 
b/src/libsysprof-ui/sysprof-recording-state-view.c
index d0d8280..31f19b2 100644
--- a/src/libsysprof-ui/sysprof-recording-state-view.c
+++ b/src/libsysprof-ui/sysprof-recording-state-view.c
@@ -66,9 +66,14 @@ sysprof_recording_state_view_notify_elapsed (SysprofRecordingStateView *self,
     {
       SysprofCaptureStat st;
       g_autofree gchar *samples = NULL;
+      gint64 count;
+
+      count = st.frame_count[SYSPROF_CAPTURE_FRAME_SAMPLE] +
+              st.frame_count[SYSPROF_CAPTURE_FRAME_MARK] +
+              st.frame_count[SYSPROF_CAPTURE_FRAME_CTRSET];
 
       sysprof_capture_writer_stat (writer, &st);
-      samples = g_strdup_printf ("%"G_GINT64_FORMAT, st.frame_count[SYSPROF_CAPTURE_FRAME_SAMPLE]);
+      samples = g_strdup_printf ("%"G_GINT64_FORMAT, count);
       gtk_label_set_label (priv->samples, samples);
     }
 
diff --git a/src/libsysprof-ui/ui/sysprof-recording-state-view.ui 
b/src/libsysprof-ui/ui/sysprof-recording-state-view.ui
index 948ae34..4b42b7d 100644
--- a/src/libsysprof-ui/ui/sysprof-recording-state-view.ui
+++ b/src/libsysprof-ui/ui/sysprof-recording-state-view.ui
@@ -50,7 +50,7 @@
             <property name="visible">true</property>
             <child>
               <object class="GtkLabel">
-                <property name="label" translatable="yes">Samples</property>
+                <property name="label" translatable="yes">Events</property>
                 <property name="xalign">1.0</property>
                 <property name="valign">baseline</property>
                 <property name="visible">true</property>