libsysprof-gtk: port mark-chart to use Chart and Series

This commit is contained in:
Christian Hergert
2023-06-26 15:32:54 -07:00
parent 045877dabc
commit a3912b27e3
5 changed files with 92 additions and 569 deletions

View File

@ -24,37 +24,39 @@
struct _SysprofMarkChartItem
{
GObject parent_instance;
SysprofSession *session;
GObject parent_instance;
SysprofSession *session;
SysprofMarkCatalog *catalog;
GtkFilterListModel *filtered;
SysprofSeries *series;
};
enum {
PROP_0,
PROP_SESSION,
PROP_CATALOG,
PROP_SERIES,
N_PROPS
};
enum {
CHANGED,
N_SIGNALS
};
G_DEFINE_FINAL_TYPE (SysprofMarkChartItem, sysprof_mark_chart_item, G_TYPE_OBJECT)
static GParamSpec *properties[N_PROPS];
static guint signals[N_SIGNALS];
static void
sysprof_mark_chart_item_session_notify_selected_time_cb (SysprofMarkChartItem *self,
GParamSpec *pspec,
SysprofSession *session)
sysprof_mark_chart_item_constructed (GObject *object)
{
g_assert (SYSPROF_IS_MARK_CHART_ITEM (self));
g_assert (SYSPROF_IS_SESSION (session));
SysprofMarkChartItem *self = (SysprofMarkChartItem *)object;
g_signal_emit (self, signals[CHANGED], 0);
G_OBJECT_CLASS (sysprof_mark_chart_item_parent_class)->constructed (object);
if (self->catalog == NULL || self->session == NULL)
g_return_if_reached ();
g_object_set (self->filtered,
"model", G_LIST_MODEL (self->catalog),
"filter", sysprof_session_get_filter (self->session),
NULL);
}
static void
@ -64,6 +66,8 @@ sysprof_mark_chart_item_dispose (GObject *object)
g_clear_object (&self->session);
g_clear_object (&self->catalog);
g_clear_object (&self->filtered);
g_clear_object (&self->series);
G_OBJECT_CLASS (sysprof_mark_chart_item_parent_class)->dispose (object);
}
@ -86,6 +90,10 @@ sysprof_mark_chart_item_get_property (GObject *object,
g_value_set_object (value, sysprof_mark_chart_item_get_session (self));
break;
case PROP_SERIES:
g_value_set_object (value, sysprof_mark_chart_item_get_series (self));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
@ -107,11 +115,6 @@ sysprof_mark_chart_item_set_property (GObject *object,
case PROP_SESSION:
self->session = g_value_dup_object (value);
g_signal_connect_object (self->session,
"notify::selected-time",
G_CALLBACK (sysprof_mark_chart_item_session_notify_selected_time_cb),
self,
G_CONNECT_SWAPPED);
break;
default:
@ -124,6 +127,7 @@ sysprof_mark_chart_item_class_init (SysprofMarkChartItemClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->constructed = sysprof_mark_chart_item_constructed;
object_class->dispose = sysprof_mark_chart_item_dispose;
object_class->get_property = sysprof_mark_chart_item_get_property;
object_class->set_property = sysprof_mark_chart_item_set_property;
@ -138,20 +142,24 @@ sysprof_mark_chart_item_class_init (SysprofMarkChartItemClass *klass)
SYSPROF_TYPE_SESSION,
(G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, N_PROPS, properties);
properties[PROP_SERIES] =
g_param_spec_object ("series", NULL, NULL,
SYSPROF_TYPE_TIME_SERIES,
(G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
signals[CHANGED] = g_signal_new ("changed",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
NULL,
G_TYPE_NONE, 0);
g_object_class_install_properties (object_class, N_PROPS, properties);
}
static void
sysprof_mark_chart_item_init (SysprofMarkChartItem *self)
{
self->filtered = gtk_filter_list_model_new (NULL, NULL);
gtk_filter_list_model_set_incremental (self->filtered, TRUE);
self->series = sysprof_time_series_new (NULL,
g_object_ref (G_LIST_MODEL (self->filtered)),
gtk_property_expression_new (SYSPROF_TYPE_DOCUMENT_MARK, NULL, "time"),
gtk_property_expression_new (SYSPROF_TYPE_DOCUMENT_MARK, NULL, "duration"));
}
SysprofMarkChartItem *
@ -179,92 +187,10 @@ sysprof_mark_chart_item_get_session (SysprofMarkChartItem *self)
return self->session;
}
typedef struct _LoadTimeSeries
{
GListModel *model;
SysprofTimeSpan time_span;
} LoadTimeSeries;
static void
load_time_series_free (LoadTimeSeries *state)
{
g_clear_object (&state->model);
g_free (state);
}
static void
load_time_series_worker (GTask *task,
gpointer source_object,
gpointer task_data,
GCancellable *cancellable)
{
LoadTimeSeries *state = task_data;
g_autoptr(SysprofTimeSeries) series = NULL;
guint n_items;
g_assert (G_IS_TASK (task));
g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
series = sysprof_time_series_new (state->model, state->time_span);
n_items = g_list_model_get_n_items (state->model);
for (guint i = 0; i < n_items; i++)
{
g_autoptr(SysprofDocumentMark) mark = g_list_model_get_item (state->model, i);
SysprofTimeSpan time_span;
time_span.begin_nsec = sysprof_document_frame_get_time (SYSPROF_DOCUMENT_FRAME (mark));
time_span.end_nsec = time_span.begin_nsec + sysprof_document_mark_get_duration (mark);
sysprof_time_series_add (series, time_span, i);
}
sysprof_time_series_sort (series);
g_task_return_pointer (task,
g_steal_pointer (&series),
(GDestroyNotify)sysprof_time_series_unref);
}
void
sysprof_mark_chart_item_load_time_series (SysprofMarkChartItem *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
g_autoptr(GTask) task = NULL;
LoadTimeSeries *state;
g_return_if_fail (SYSPROF_IS_MARK_CHART_ITEM (self));
g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable));
task = g_task_new (self, cancellable, callback, user_data);
g_task_set_source_tag (task, sysprof_mark_chart_item_load_time_series);
if (self->catalog == NULL || self->session == NULL)
{
g_task_return_new_error (task,
G_IO_ERROR,
G_IO_ERROR_FAILED,
"No available data to generate");
return;
}
state = g_new0 (LoadTimeSeries, 1);
state->model = g_object_ref (G_LIST_MODEL (self->catalog));
state->time_span = *sysprof_session_get_selected_time (self->session);
g_task_set_task_data (task, state, (GDestroyNotify)load_time_series_free);
g_task_run_in_thread (task, load_time_series_worker);
}
SysprofTimeSeries *
sysprof_mark_chart_item_load_time_series_finish (SysprofMarkChartItem *self,
GAsyncResult *result,
GError **error)
sysprof_mark_chart_item_get_series (SysprofMarkChartItem *self)
{
g_return_val_if_fail (SYSPROF_IS_MARK_CHART_ITEM (self), NULL);
g_return_val_if_fail (G_IS_TASK (result), NULL);
return g_task_propagate_pointer (G_TASK (result), error);
return SYSPROF_TIME_SERIES (self->series);
}