diskstat: add aid to show duplex graph for disk graphs

src/libsysprof-ui/meson.build

@@ -28,6 +28,7 @@ libsysprof_ui_private_sources = [
   'sysprof-cpu-aid.c',
   'sysprof-depth-visualizer.c',
   'sysprof-details-page.c',
+  'sysprof-diskstat-aid.c',
   'sysprof-display.c',
   'sysprof-duplex-visualizer.c',
   'sysprof-environ.c',

src/libsysprof-ui/sysprof-diskstat-aid.c

@@ -0,0 +1,268 @@
+/* sysprof-diskstat-aid.c
+ *
+ * Copyright 2019 Christian Hergert <chergert@redhat.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+#define G_LOG_DOMAIN "sysprof-diskstat-aid"
+
+#include "config.h"
+
+#include <glib/gi18n.h>
+#include <string.h>
+
+#include "sysprof-color-cycle.h"
+#include "sysprof-duplex-visualizer.h"
+#include "sysprof-diskstat-aid.h"
+
+struct _SysprofDiskstatAid
+{
+  SysprofAid parent_instance;
+};
+
+typedef struct
+{
+  SysprofCaptureCursor *cursor;
+  SysprofDisplay       *display;
+} Present;
+
+G_DEFINE_TYPE (SysprofDiskstatAid, sysprof_diskstat_aid, SYSPROF_TYPE_AID)
+
+static void
+present_free (gpointer data)
+{
+  Present *p = data;
+
+  g_clear_pointer (&p->cursor, sysprof_capture_cursor_unref);
+  g_clear_object (&p->display);
+  g_slice_free (Present, p);
+}
+
+/**
+ * sysprof_diskstat_aid_new:
+ *
+ * Create a new #SysprofDiskstatAid.
+ *
+ * Returns: (transfer full): a newly created #SysprofDiskstatAid
+ *
+ * Since: 3.34
+ */
+SysprofAid *
+sysprof_diskstat_aid_new (void)
+{
+  return g_object_new (SYSPROF_TYPE_DISKSTAT_AID, NULL);
+}
+
+static void
+sysprof_diskstat_aid_prepare (SysprofAid      *self,
+                              SysprofProfiler *profiler)
+{
+  g_autoptr(SysprofSource) source = NULL;
+
+  g_assert (SYSPROF_IS_DISKSTAT_AID (self));
+  g_assert (SYSPROF_IS_PROFILER (profiler));
+
+  source = sysprof_diskstat_source_new ();
+  sysprof_profiler_add_source (profiler, source);
+}
+
+static gboolean
+collect_diskstat_counters (const SysprofCaptureFrame *frame,
+                           gpointer                   user_data)
+{
+  SysprofCaptureCounterDefine *def = (SysprofCaptureCounterDefine *)frame;
+  GArray *counters = user_data;
+
+  g_assert (frame != NULL);
+  g_assert (frame->type == SYSPROF_CAPTURE_FRAME_CTRDEF);
+  g_assert (counters != NULL);
+
+  for (guint i = 0; i < def->n_counters; i++)
+    {
+      const SysprofCaptureCounter *counter = &def->counters[i];
+
+      if (strcmp (counter->category, "Disk") == 0 &&
+          (g_str_has_prefix (counter->name, "Total Reads") ||
+           g_str_has_prefix (counter->name, "Total Writes")))
+        g_array_append_vals (counters, counter, 1);
+    }
+
+  return TRUE;
+}
+
+static void
+sysprof_diskstat_aid_present_worker (GTask        *task,
+                                     gpointer      source_object,
+                                     gpointer      task_data,
+                                     GCancellable *cancellable)
+{
+  Present *present = task_data;
+  g_autoptr(GArray) counters = NULL;
+
+  g_assert (G_IS_TASK (task));
+  g_assert (SYSPROF_IS_DISKSTAT_AID (source_object));
+  g_assert (present != NULL);
+  g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
+
+  counters = g_array_new (FALSE, FALSE, sizeof (SysprofCaptureCounter));
+  sysprof_capture_cursor_foreach (present->cursor, collect_diskstat_counters, counters);
+  g_task_return_pointer (task,
+                         g_steal_pointer (&counters),
+                         (GDestroyNotify) g_array_unref);
+}
+
+static guint
+find_other_id (GArray      *counters,
+               const gchar *name)
+{
+  g_autofree gchar *other = NULL;
+
+  g_assert (counters);
+  g_assert (name != NULL);
+  g_assert (g_str_has_prefix (name, "Total Reads"));
+
+  other = g_strdup_printf ("Total Writes%s", name + strlen ("Total Reads"));
+
+  for (guint i = 0; i < counters->len; i++)
+    {
+      const SysprofCaptureCounter *c = &g_array_index (counters, SysprofCaptureCounter, i);
+
+      if (g_str_equal (c->name, other))
+        return c->id;
+    }
+
+  return 0;
+}
+
+static void
+sysprof_diskstat_aid_present_async (SysprofAid           *aid,
+                                    SysprofCaptureReader *reader,
+                                    SysprofDisplay       *display,
+                                    GCancellable         *cancellable,
+                                    GAsyncReadyCallback   callback,
+                                    gpointer              user_data)
+{
+  static const SysprofCaptureFrameType types[] = { SYSPROF_CAPTURE_FRAME_CTRDEF };
+  g_autoptr(SysprofCaptureCondition) condition = NULL;
+  g_autoptr(SysprofCaptureCursor) cursor = NULL;
+  g_autoptr(GTask) task = NULL;
+  Present present;
+
+  g_assert (SYSPROF_IS_DISKSTAT_AID (aid));
+  g_assert (reader != NULL);
+  g_assert (SYSPROF_IS_DISPLAY (display));
+  g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
+
+  condition = sysprof_capture_condition_new_where_type_in (1, types);
+  cursor = sysprof_capture_cursor_new (reader);
+  sysprof_capture_cursor_add_condition (cursor, g_steal_pointer (&condition));
+
+  present.cursor = g_steal_pointer (&cursor);
+  present.display = g_object_ref (display);
+
+  task = g_task_new (aid, cancellable, callback, user_data);
+  g_task_set_source_tag (task, sysprof_diskstat_aid_present_async);
+  g_task_set_task_data (task,
+                        g_slice_dup (Present, &present),
+                        present_free);
+  g_task_run_in_thread (task, sysprof_diskstat_aid_present_worker);
+}
+
+static gboolean
+sysprof_diskstat_aid_present_finish (SysprofAid    *aid,
+                                     GAsyncResult  *result,
+                                     GError       **error)
+{
+  g_autoptr(GArray) counters = NULL;
+  Present *present;
+
+  g_assert (SYSPROF_IS_AID (aid));
+  g_assert (G_IS_TASK (result));
+
+  present = g_task_get_task_data (G_TASK (result));
+
+  if ((counters = g_task_propagate_pointer (G_TASK (result), error)))
+    {
+      g_autoptr(SysprofColorCycle) cycle = sysprof_color_cycle_new ();
+      SysprofVisualizerGroup *group;
+
+      group = g_object_new (SYSPROF_TYPE_VISUALIZER_GROUP,
+                            "can-focus", TRUE,
+                            "title", _("Disk"),
+                            "visible", TRUE,
+                            NULL);
+
+      for (guint i = 0; i < counters->len; i++)
+        {
+          const SysprofCaptureCounter *ctr = &g_array_index (counters, SysprofCaptureCounter, i);
+
+          if (g_str_has_prefix (ctr->name, "Total Reads"))
+            {
+              g_autofree gchar *title = NULL;
+              gboolean is_combined;
+              GtkWidget *row;
+              GdkRGBA rgba;
+              guint other_id;
+
+              if (!(other_id = find_other_id (counters, ctr->name)))
+                continue;
+
+              is_combined = g_str_equal (ctr->description, "Combined");
+
+              if (is_combined)
+                title = g_strdup ("Disk Reads/Writes (All)");
+              else
+                title = g_strdup_printf ("Disk Reads/Writes%s", ctr->name + strlen ("Total Reads"));
+
+              row = g_object_new (SYSPROF_TYPE_DUPLEX_VISUALIZER,
+                                  "title", title,
+                                  "height-request", 35,
+                                  "visible", is_combined,
+                                  NULL);
+              sysprof_color_cycle_next (cycle, &rgba);
+              sysprof_duplex_visualizer_set_counters  (SYSPROF_DUPLEX_VISUALIZER (row), ctr->id, other_id);
+              sysprof_duplex_visualizer_set_colors (SYSPROF_DUPLEX_VISUALIZER (row), &rgba, &rgba);
+              sysprof_duplex_visualizer_set_use_diff (SYSPROF_DUPLEX_VISUALIZER (row), FALSE);
+              sysprof_visualizer_group_insert (group, SYSPROF_VISUALIZER (row), is_combined ? 0 : -1, !is_combined);
+            }
+        }
+
+      if (counters->len > 0)
+        sysprof_display_add_group (present->display, group);
+      else
+        gtk_widget_destroy (GTK_WIDGET (group));
+    }
+
+  return counters != NULL;
+}
+
+static void
+sysprof_diskstat_aid_class_init (SysprofDiskstatAidClass *klass)
+{
+  SysprofAidClass *aid_class = SYSPROF_AID_CLASS (klass);
+
+  aid_class->prepare = sysprof_diskstat_aid_prepare;
+  aid_class->present_async = sysprof_diskstat_aid_present_async;
+  aid_class->present_finish = sysprof_diskstat_aid_present_finish;
+}
+
+static void
+sysprof_diskstat_aid_init (SysprofDiskstatAid *self)
+{
+  sysprof_aid_set_display_name (SYSPROF_AID (self), _("Disk"));
+  sysprof_aid_set_icon_name (SYSPROF_AID (self), "drive-harddisk-system-symbolic");
+}

src/libsysprof-ui/sysprof-diskstat-aid.h

@@ -0,0 +1,33 @@
+/* sysprof-diskstat-aid.h
+ *
+ * Copyright 2019 Christian Hergert <chergert@redhat.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+#pragma once
+
+#include "sysprof-aid.h"
+
+G_BEGIN_DECLS
+
+#define SYSPROF_TYPE_DISKSTAT_AID (sysprof_diskstat_aid_get_type())
+
+G_DECLARE_FINAL_TYPE (SysprofDiskstatAid, sysprof_diskstat_aid, SYSPROF, DISKSTAT_AID, SysprofAid)
+
+SysprofAid *sysprof_diskstat_aid_new (void);
+
+G_END_DECLS

src/libsysprof-ui/sysprof-display.c

@@ -39,6 +39,7 @@
 #include "sysprof-callgraph-aid.h"
 #include "sysprof-counters-aid.h"
 #include "sysprof-cpu-aid.h"
+#include "sysprof-diskstat-aid.h"
 #include "sysprof-logs-aid.h"
 #include "sysprof-marks-aid.h"
 #include "sysprof-netdev-aid.h"
@@ -631,6 +632,7 @@ sysprof_display_present_async (SysprofDisplay       *self,
   g_ptr_array_add (aids, sysprof_counters_aid_new ());
   g_ptr_array_add (aids, sysprof_cpu_aid_new ());
   g_ptr_array_add (aids, sysprof_callgraph_aid_new ());
+  g_ptr_array_add (aids, sysprof_diskstat_aid_new ());
   g_ptr_array_add (aids, sysprof_logs_aid_new ());
   g_ptr_array_add (aids, sysprof_marks_aid_new ());
   g_ptr_array_add (aids, sysprof_netdev_aid_new ());