[sysprof/wip/chergert/sysprof-3] libsysprof-ui: add stack-depth visualizer
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [sysprof/wip/chergert/sysprof-3] libsysprof-ui: add stack-depth visualizer
- Date: Mon, 20 May 2019 07:44:19 +0000 (UTC)
commit ba19264443984e5ade83852a203b0a93c195c822
Author: Christian Hergert <chergert redhat com>
Date: Mon May 20 00:43:44 2019 -0700
libsysprof-ui: add stack-depth visualizer
src/libsysprof-ui/meson.build | 1 +
src/libsysprof-ui/sysprof-depth-visualizer-row.c | 314 +++++++++++++++++++++++
src/libsysprof-ui/sysprof-depth-visualizer-row.h | 31 +++
src/libsysprof-ui/sysprof-visualizer-list.c | 29 ++-
4 files changed, 371 insertions(+), 4 deletions(-)
---
diff --git a/src/libsysprof-ui/meson.build b/src/libsysprof-ui/meson.build
index 3f6858d..39965ab 100644
--- a/src/libsysprof-ui/meson.build
+++ b/src/libsysprof-ui/meson.build
@@ -36,6 +36,7 @@ libsysprof_ui_private_sources = [
'sysprof-cairo.c',
'sysprof-cell-renderer-duration.c',
'sysprof-cell-renderer-percent.c',
+ 'sysprof-depth-visualizer-row.c',
'sysprof-environ-editor-row.c',
'sysprof-environ-editor.c',
'sysprof-environ-variable.c',
diff --git a/src/libsysprof-ui/sysprof-depth-visualizer-row.c
b/src/libsysprof-ui/sysprof-depth-visualizer-row.c
new file mode 100644
index 0000000..e2a60c5
--- /dev/null
+++ b/src/libsysprof-ui/sysprof-depth-visualizer-row.c
@@ -0,0 +1,314 @@
+/* sysprof-depth-visualizer-row.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-depth-visualizer-row"
+
+#include "config.h"
+
+#include <glib/gi18n.h>
+
+#include "pointcache.h"
+#include "sysprof-depth-visualizer-row.h"
+
+struct _SysprofDepthVisualizerRow
+{
+ SysprofVisualizerRow parent_instance;
+ SysprofCaptureReader *reader;
+ PointCache *points;
+ guint reload_source;
+};
+
+typedef struct
+{
+ SysprofCaptureReader *reader;
+ PointCache *pc;
+ gint64 begin_time;
+ gint64 end_time;
+ gint64 duration;
+ guint max_n_addrs;
+} State;
+
+G_DEFINE_TYPE (SysprofDepthVisualizerRow, sysprof_depth_visualizer_row, SYSPROF_TYPE_VISUALIZER_ROW)
+
+static void
+state_free (State *st)
+{
+ g_clear_pointer (&st->reader, sysprof_capture_reader_unref);
+ g_clear_pointer (&st->pc, point_cache_unref);
+ g_slice_free (State, st);
+}
+
+static gboolean
+discover_max_n_addr (const SysprofCaptureFrame *frame,
+ gpointer user_data)
+{
+ const SysprofCaptureSample *sample = (const SysprofCaptureSample *)frame;
+ State *st = user_data;
+
+ g_assert (frame != NULL);
+ g_assert (frame->type == SYSPROF_CAPTURE_FRAME_SAMPLE);
+ g_assert (st != NULL);
+
+ st->max_n_addrs = MAX (st->max_n_addrs, sample->n_addrs);
+
+ return TRUE;
+}
+
+static gboolean
+build_point_cache_cb (const SysprofCaptureFrame *frame,
+ gpointer user_data)
+{
+ const SysprofCaptureSample *sample = (const SysprofCaptureSample *)frame;
+ State *st = user_data;
+ gdouble x, y;
+
+ g_assert (frame != NULL);
+ g_assert (frame->type == SYSPROF_CAPTURE_FRAME_SAMPLE);
+ g_assert (st != NULL);
+
+ x = (frame->time - st->begin_time) / (gdouble)st->duration;
+ y = sample->n_addrs / (gdouble)st->max_n_addrs;
+ point_cache_add_point_to_set (st->pc, 1, x, y);
+
+ return TRUE;
+}
+
+static void
+sysprof_depth_visualizer_row_worker (GTask *task,
+ gpointer source_object,
+ gpointer task_data,
+ GCancellable *cancellable)
+{
+ static const SysprofCaptureFrameType types[] = { SYSPROF_CAPTURE_FRAME_SAMPLE, };
+ g_autoptr(SysprofCaptureCursor) cursor = NULL;
+ SysprofCaptureCondition *condition;
+ State *st = task_data;
+
+ g_assert (G_IS_TASK (task));
+ g_assert (SYSPROF_IS_DEPTH_VISUALIZER_ROW (source_object));
+ g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
+
+ if (st->duration != 0)
+ {
+ cursor = sysprof_capture_cursor_new (st->reader);
+ condition = sysprof_capture_condition_new_where_type_in (G_N_ELEMENTS (types), types);
+ sysprof_capture_cursor_add_condition (cursor, g_steal_pointer (&condition));
+
+ sysprof_capture_cursor_foreach (cursor, discover_max_n_addr, st);
+ sysprof_capture_cursor_reset (cursor);
+ sysprof_capture_cursor_foreach (cursor, build_point_cache_cb, st);
+ }
+
+ g_task_return_pointer (task,
+ g_steal_pointer (&st->pc),
+ (GDestroyNotify) point_cache_unref);
+}
+
+static void
+apply_point_cache_cb (GObject *object,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ SysprofDepthVisualizerRow *self = (SysprofDepthVisualizerRow *)object;
+ PointCache *pc;
+
+ g_assert (SYSPROF_IS_DEPTH_VISUALIZER_ROW (self));
+ g_assert (G_IS_TASK (result));
+
+ if ((pc = g_task_propagate_pointer (G_TASK (result), NULL)))
+ {
+ g_clear_pointer (&self->points, point_cache_unref);
+ self->points = g_steal_pointer (&pc);
+ gtk_widget_queue_draw (GTK_WIDGET (self));
+ }
+}
+
+static void
+sysprof_depth_visualizer_row_reload (SysprofDepthVisualizerRow *self)
+{
+ g_autoptr(GTask) task = NULL;
+ GtkAllocation alloc;
+ State *st;
+
+ g_assert (SYSPROF_IS_DEPTH_VISUALIZER_ROW (self));
+
+ gtk_widget_get_allocation (GTK_WIDGET (self), &alloc);
+
+ st = g_slice_new0 (State);
+ st->reader = sysprof_capture_reader_ref (self->reader);
+ st->pc = point_cache_new ();
+ st->max_n_addrs = 0;
+ st->begin_time = sysprof_capture_reader_get_start_time (self->reader);
+ st->end_time = sysprof_capture_reader_get_end_time (self->reader);
+ st->duration = st->end_time - st->begin_time;
+
+ point_cache_add_set (st->pc, 1);
+
+ task = g_task_new (self, NULL, apply_point_cache_cb, NULL);
+ g_task_set_source_tag (task, sysprof_depth_visualizer_row_reload);
+ g_task_set_task_data (task, st, (GDestroyNotify) state_free);
+ g_task_run_in_thread (task, sysprof_depth_visualizer_row_worker);
+}
+
+static void
+sysprof_depth_visualizer_row_set_reader (SysprofVisualizerRow *row,
+ SysprofCaptureReader *reader)
+{
+ SysprofDepthVisualizerRow *self = (SysprofDepthVisualizerRow *)row;
+
+ g_assert (SYSPROF_IS_DEPTH_VISUALIZER_ROW (self));
+
+ if (self->reader != reader)
+ {
+ if (self->reader != NULL)
+ {
+ sysprof_capture_reader_unref (self->reader);
+ self->reader = NULL;
+ }
+
+ if (reader != NULL)
+ {
+ self->reader = sysprof_capture_reader_ref (reader);
+ sysprof_depth_visualizer_row_reload (self);
+ }
+ }
+}
+
+static gboolean
+sysprof_depth_visualizer_row_draw (GtkWidget *widget,
+ cairo_t *cr)
+{
+ SysprofDepthVisualizerRow *self = (SysprofDepthVisualizerRow *)widget;
+ GtkAllocation alloc;
+ const Point *points;
+ guint n_points = 0;
+
+ g_assert (SYSPROF_IS_DEPTH_VISUALIZER_ROW (self));
+ g_assert (cr != NULL);
+
+ GTK_WIDGET_CLASS (sysprof_depth_visualizer_row_parent_class)->draw (widget, cr);
+
+ if (self->points == NULL)
+ return GDK_EVENT_PROPAGATE;
+
+ gtk_widget_get_allocation (widget, &alloc);
+
+ if ((points = point_cache_get_points (self->points, 1, &n_points)))
+ {
+ g_autofree SysprofVisualizerRowAbsolutePoint *out_points = NULL;
+
+ //g_print ("Points : %p %d\n", points, n_points);
+
+ out_points = g_new (SysprofVisualizerRowAbsolutePoint, n_points);
+ sysprof_visualizer_row_translate_points (SYSPROF_VISUALIZER_ROW (widget),
+ (const SysprofVisualizerRowRelativePoint *)points,
+ n_points, out_points, n_points);
+
+ for (guint i = 0; i < n_points; i++)
+ {
+ cairo_move_to (cr, alloc.x + (guint)out_points[i].x, alloc.height);
+ cairo_line_to (cr, alloc.x + (guint)out_points[i].x, out_points[i].y);
+ }
+
+ cairo_set_line_width (cr, 1.0);
+ cairo_set_source_rgb (cr, 0, 0, 0);
+ cairo_stroke (cr);
+ }
+
+ return GDK_EVENT_PROPAGATE;
+}
+
+static gboolean
+sysprof_depth_visualizer_row_do_reload (gpointer data)
+{
+ SysprofDepthVisualizerRow *self = data;
+ self->reload_source = 0;
+ sysprof_depth_visualizer_row_reload (self);
+ return G_SOURCE_REMOVE;
+}
+
+static void
+sysprof_depth_visualizer_row_queue_reload (SysprofDepthVisualizerRow *self)
+{
+ g_assert (SYSPROF_IS_DEPTH_VISUALIZER_ROW (self));
+
+ if (self->reload_source)
+ g_source_remove (self->reload_source);
+
+ self->reload_source = gdk_threads_add_idle (sysprof_depth_visualizer_row_do_reload, self);
+}
+
+static void
+sysprof_depth_visualizer_row_size_allocate (GtkWidget *widget,
+ GtkAllocation *alloc)
+{
+ GTK_WIDGET_CLASS (sysprof_depth_visualizer_row_parent_class)->size_allocate (widget, alloc);
+
+ sysprof_depth_visualizer_row_queue_reload (SYSPROF_DEPTH_VISUALIZER_ROW (widget));
+}
+
+static void
+sysprof_depth_visualizer_row_finalize (GObject *object)
+{
+ SysprofDepthVisualizerRow *self = (SysprofDepthVisualizerRow *)object;
+
+ g_clear_pointer (&self->reader, sysprof_capture_reader_unref);
+
+ if (self->reload_source)
+ {
+ g_source_remove (self->reload_source);
+ self->reload_source = 0;
+ }
+
+ G_OBJECT_CLASS (sysprof_depth_visualizer_row_parent_class)->finalize (object);
+}
+
+static void
+sysprof_depth_visualizer_row_class_init (SysprofDepthVisualizerRowClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+ SysprofVisualizerRowClass *row_class = SYSPROF_VISUALIZER_ROW_CLASS (klass);
+
+ object_class->finalize = sysprof_depth_visualizer_row_finalize;
+
+ widget_class->draw = sysprof_depth_visualizer_row_draw;
+ widget_class->size_allocate = sysprof_depth_visualizer_row_size_allocate;
+
+ row_class->set_reader = sysprof_depth_visualizer_row_set_reader;
+}
+
+static void
+sysprof_depth_visualizer_row_init (SysprofDepthVisualizerRow *self)
+{
+ PangoAttrList *attrs = pango_attr_list_new ();
+ GtkWidget *label;
+
+ pango_attr_list_insert (attrs, pango_attr_scale_new (PANGO_SCALE_SMALL * PANGO_SCALE_SMALL));
+ label = g_object_new (GTK_TYPE_LABEL,
+ "label", _("Stack Depth"),
+ "attributes", attrs,
+ "visible", TRUE,
+ "xalign", 0.0f,
+ "yalign", 0.0f,
+ NULL);
+ gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (label));
+ pango_attr_list_unref (attrs);
+}
diff --git a/src/libsysprof-ui/sysprof-depth-visualizer-row.h
b/src/libsysprof-ui/sysprof-depth-visualizer-row.h
new file mode 100644
index 0000000..f413f8d
--- /dev/null
+++ b/src/libsysprof-ui/sysprof-depth-visualizer-row.h
@@ -0,0 +1,31 @@
+/* sysprof-depth-visualizer-row.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-visualizer-row.h"
+
+G_BEGIN_DECLS
+
+#define SYSPROF_TYPE_DEPTH_VISUALIZER_ROW (sysprof_depth_visualizer_row_get_type())
+
+G_DECLARE_FINAL_TYPE (SysprofDepthVisualizerRow, sysprof_depth_visualizer_row, SYSPROF,
DEPTH_VISUALIZER_ROW, SysprofVisualizerRow)
+
+G_END_DECLS
diff --git a/src/libsysprof-ui/sysprof-visualizer-list.c b/src/libsysprof-ui/sysprof-visualizer-list.c
index 2e0f181..55c9f32 100644
--- a/src/libsysprof-ui/sysprof-visualizer-list.c
+++ b/src/libsysprof-ui/sysprof-visualizer-list.c
@@ -26,6 +26,7 @@
#include <sysprof.h>
#include "sysprof-cpu-visualizer-row.h"
+#include "sysprof-depth-visualizer-row.h"
#include "sysprof-visualizer-list.h"
#include "sysprof-visualizer-row.h"
#include "sysprof-mark-visualizer-row.h"
@@ -45,6 +46,7 @@ typedef struct
guint pixels_counter;
GArray *memory;
guint has_cpu : 1;
+ guint has_sample : 1;
} Discovery;
enum {
@@ -214,15 +216,18 @@ discover_new_rows_frame_cb (const SysprofCaptureFrame *frame,
* and widget views to be displayed.
*/
- if (frame->type == SYSPROF_CAPTURE_FRAME_MARK)
+ if (frame->type == SYSPROF_CAPTURE_FRAME_SAMPLE)
+ {
+ state->has_sample = TRUE;
+ }
+ else if (frame->type == SYSPROF_CAPTURE_FRAME_MARK)
{
const SysprofCaptureMark *mark = (const SysprofCaptureMark *)frame;
if (!g_hash_table_contains (state->mark_groups, mark->group))
g_hash_table_add (state->mark_groups, g_strdup (mark->group));
}
-
- if (frame->type == SYSPROF_CAPTURE_FRAME_CTRDEF)
+ else if (frame->type == SYSPROF_CAPTURE_FRAME_CTRDEF)
{
const SysprofCaptureFrameCounterDefine *def = (const SysprofCaptureFrameCounterDefine *)frame;
@@ -272,6 +277,7 @@ handle_capture_results (GObject *object,
gpointer user_data)
{
SysprofVisualizerList *self = (SysprofVisualizerList *)object;
+ SysprofVisualizerListPrivate *priv = sysprof_visualizer_list_get_instance_private (self);
Discovery *state;
const gchar *key;
@@ -303,6 +309,17 @@ handle_capture_results (GObject *object,
gtk_container_add (GTK_CONTAINER (self), row);
}
+ if (state->has_sample)
+ {
+ GtkWidget *row = g_object_new (SYSPROF_TYPE_DEPTH_VISUALIZER_ROW,
+ "zoom-manager", priv->zoom_manager,
+ "height-request", 50,
+ "selectable", FALSE,
+ "visible", TRUE,
+ NULL);
+ gtk_container_add (GTK_CONTAINER (self), row);
+ }
+
for (guint i = 0; i < state->memory->len; i++)
{
guint counter_id = g_array_index (state->memory, guint, i);
@@ -382,7 +399,11 @@ static void
discover_new_rows (SysprofVisualizerList *self,
SysprofCaptureReader *reader)
{
- static const SysprofCaptureFrameType types[] = { SYSPROF_CAPTURE_FRAME_CTRDEF, SYSPROF_CAPTURE_FRAME_MARK
};
+ static const SysprofCaptureFrameType types[] = {
+ SYSPROF_CAPTURE_FRAME_CTRDEF,
+ SYSPROF_CAPTURE_FRAME_MARK,
+ SYSPROF_CAPTURE_FRAME_SAMPLE,
+ };
g_autoptr(SysprofCaptureCursor) cursor = NULL;
g_autoptr(GTask) task = NULL;
SysprofCaptureCondition *condition;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]