mirror of
https://github.com/varun-r-mallya/sysprof.git
synced 2026-02-12 16:10:54 +00:00
libsysprof-gtk: remove indirection from timeseries calculation
Require an expression to get the end-time so that we can directly bind it to the series generation.
This commit is contained in:
@ -159,7 +159,7 @@ sysprof_mark_chart_item_init (SysprofMarkChartItem *self)
|
|||||||
self->series = sysprof_time_series_new (NULL,
|
self->series = sysprof_time_series_new (NULL,
|
||||||
g_object_ref (G_LIST_MODEL (self->filtered)),
|
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, "time"),
|
||||||
gtk_property_expression_new (SYSPROF_TYPE_DOCUMENT_MARK, NULL, "duration"),
|
gtk_property_expression_new (SYSPROF_TYPE_DOCUMENT_MARK, NULL, "end-time"),
|
||||||
gtk_property_expression_new (SYSPROF_TYPE_DOCUMENT_MARK, NULL, "message"));
|
gtk_property_expression_new (SYSPROF_TYPE_DOCUMENT_MARK, NULL, "message"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -25,8 +25,8 @@
|
|||||||
struct _SysprofTimeSeriesItem
|
struct _SysprofTimeSeriesItem
|
||||||
{
|
{
|
||||||
GObject parent_instance;
|
GObject parent_instance;
|
||||||
GtkExpression *time_expression;
|
GtkExpression *begin_time_expression;
|
||||||
GtkExpression *duration_expression;
|
GtkExpression *end_time_expression;
|
||||||
GObject *item;
|
GObject *item;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -34,7 +34,7 @@ enum {
|
|||||||
PROP_0,
|
PROP_0,
|
||||||
PROP_DURATION,
|
PROP_DURATION,
|
||||||
PROP_ITEM,
|
PROP_ITEM,
|
||||||
PROP_TIME,
|
PROP_BEGIN_TIME,
|
||||||
PROP_END_TIME,
|
PROP_END_TIME,
|
||||||
N_PROPS
|
N_PROPS
|
||||||
};
|
};
|
||||||
@ -49,8 +49,8 @@ sysprof_time_series_item_finalize (GObject *object)
|
|||||||
SysprofTimeSeriesItem *self = (SysprofTimeSeriesItem *)object;
|
SysprofTimeSeriesItem *self = (SysprofTimeSeriesItem *)object;
|
||||||
|
|
||||||
g_clear_object (&self->item);
|
g_clear_object (&self->item);
|
||||||
g_clear_pointer (&self->time_expression, gtk_expression_unref);
|
g_clear_pointer (&self->begin_time_expression, gtk_expression_unref);
|
||||||
g_clear_pointer (&self->duration_expression, gtk_expression_unref);
|
g_clear_pointer (&self->end_time_expression, gtk_expression_unref);
|
||||||
|
|
||||||
G_OBJECT_CLASS (sysprof_time_series_item_parent_class)->finalize (object);
|
G_OBJECT_CLASS (sysprof_time_series_item_parent_class)->finalize (object);
|
||||||
}
|
}
|
||||||
@ -73,8 +73,8 @@ sysprof_time_series_item_get_property (GObject *object,
|
|||||||
g_value_set_int64 (value, sysprof_time_series_item_get_duration (self));
|
g_value_set_int64 (value, sysprof_time_series_item_get_duration (self));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_TIME:
|
case PROP_BEGIN_TIME:
|
||||||
g_value_set_int64 (value, sysprof_time_series_item_get_time (self));
|
g_value_set_int64 (value, sysprof_time_series_item_get_begin_time (self));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_END_TIME:
|
case PROP_END_TIME:
|
||||||
@ -99,8 +99,8 @@ sysprof_time_series_item_class_init (SysprofTimeSeriesItemClass *klass)
|
|||||||
G_TYPE_OBJECT,
|
G_TYPE_OBJECT,
|
||||||
(G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
|
(G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
|
||||||
|
|
||||||
properties [PROP_TIME] =
|
properties [PROP_BEGIN_TIME] =
|
||||||
g_param_spec_int64 ("time", NULL, NULL,
|
g_param_spec_int64 ("begin-time", NULL, NULL,
|
||||||
G_MININT64, G_MAXINT64, 0,
|
G_MININT64, G_MAXINT64, 0,
|
||||||
(G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
|
(G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
|
||||||
|
|
||||||
@ -124,15 +124,15 @@ sysprof_time_series_item_init (SysprofTimeSeriesItem *self)
|
|||||||
|
|
||||||
SysprofTimeSeriesItem *
|
SysprofTimeSeriesItem *
|
||||||
_sysprof_time_series_item_new (GObject *item,
|
_sysprof_time_series_item_new (GObject *item,
|
||||||
GtkExpression *time_expression,
|
GtkExpression *begin_time_expression,
|
||||||
GtkExpression *duration_expression)
|
GtkExpression *end_time_expression)
|
||||||
{
|
{
|
||||||
SysprofTimeSeriesItem *self;
|
SysprofTimeSeriesItem *self;
|
||||||
|
|
||||||
self = g_object_new (SYSPROF_TYPE_TIME_SERIES_ITEM, NULL);
|
self = g_object_new (SYSPROF_TYPE_TIME_SERIES_ITEM, NULL);
|
||||||
self->item = item;
|
self->item = item;
|
||||||
self->time_expression = time_expression;
|
self->begin_time_expression = begin_time_expression;
|
||||||
self->duration_expression = duration_expression;
|
self->end_time_expression = end_time_expression;
|
||||||
|
|
||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
@ -154,7 +154,7 @@ sysprof_time_series_item_get_item (SysprofTimeSeriesItem *self)
|
|||||||
}
|
}
|
||||||
|
|
||||||
gint64
|
gint64
|
||||||
sysprof_time_series_item_get_time (SysprofTimeSeriesItem *self)
|
sysprof_time_series_item_get_begin_time (SysprofTimeSeriesItem *self)
|
||||||
{
|
{
|
||||||
GValue value = G_VALUE_INIT;
|
GValue value = G_VALUE_INIT;
|
||||||
gint64 ret;
|
gint64 ret;
|
||||||
@ -162,7 +162,7 @@ sysprof_time_series_item_get_time (SysprofTimeSeriesItem *self)
|
|||||||
g_return_val_if_fail (SYSPROF_IS_TIME_SERIES_ITEM (self), 0);
|
g_return_val_if_fail (SYSPROF_IS_TIME_SERIES_ITEM (self), 0);
|
||||||
|
|
||||||
g_value_init (&value, G_TYPE_INT64);
|
g_value_init (&value, G_TYPE_INT64);
|
||||||
gtk_expression_evaluate (self->time_expression, self->item, &value);
|
gtk_expression_evaluate (self->begin_time_expression, self->item, &value);
|
||||||
ret = g_value_get_int64 (&value);
|
ret = g_value_get_int64 (&value);
|
||||||
g_value_unset (&value);
|
g_value_unset (&value);
|
||||||
|
|
||||||
@ -171,6 +171,12 @@ sysprof_time_series_item_get_time (SysprofTimeSeriesItem *self)
|
|||||||
|
|
||||||
gint64
|
gint64
|
||||||
sysprof_time_series_item_get_duration (SysprofTimeSeriesItem *self)
|
sysprof_time_series_item_get_duration (SysprofTimeSeriesItem *self)
|
||||||
|
{
|
||||||
|
return sysprof_time_series_item_get_end_time (self) - sysprof_time_series_item_get_begin_time (self);
|
||||||
|
}
|
||||||
|
|
||||||
|
gint64
|
||||||
|
sysprof_time_series_item_get_end_time (SysprofTimeSeriesItem *self)
|
||||||
{
|
{
|
||||||
GValue value = G_VALUE_INIT;
|
GValue value = G_VALUE_INIT;
|
||||||
gint64 ret;
|
gint64 ret;
|
||||||
@ -178,16 +184,9 @@ sysprof_time_series_item_get_duration (SysprofTimeSeriesItem *self)
|
|||||||
g_return_val_if_fail (SYSPROF_IS_TIME_SERIES_ITEM (self), 0);
|
g_return_val_if_fail (SYSPROF_IS_TIME_SERIES_ITEM (self), 0);
|
||||||
|
|
||||||
g_value_init (&value, G_TYPE_INT64);
|
g_value_init (&value, G_TYPE_INT64);
|
||||||
gtk_expression_evaluate (self->duration_expression, self->item, &value);
|
gtk_expression_evaluate (self->end_time_expression, self->item, &value);
|
||||||
ret = g_value_get_int64 (&value);
|
ret = g_value_get_int64 (&value);
|
||||||
g_value_unset (&value);
|
g_value_unset (&value);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
gint64
|
|
||||||
sysprof_time_series_item_get_end_time (SysprofTimeSeriesItem *self)
|
|
||||||
{
|
|
||||||
return sysprof_time_series_item_get_time (self) +
|
|
||||||
sysprof_time_series_item_get_duration (self);
|
|
||||||
}
|
|
||||||
|
|||||||
@ -32,7 +32,7 @@ SYSPROF_AVAILABLE_IN_ALL
|
|||||||
G_DECLARE_FINAL_TYPE (SysprofTimeSeriesItem, sysprof_time_series_item, SYSPROF, TIME_SERIES_ITEM, GObject)
|
G_DECLARE_FINAL_TYPE (SysprofTimeSeriesItem, sysprof_time_series_item, SYSPROF, TIME_SERIES_ITEM, GObject)
|
||||||
|
|
||||||
SYSPROF_AVAILABLE_IN_ALL
|
SYSPROF_AVAILABLE_IN_ALL
|
||||||
gint64 sysprof_time_series_item_get_time (SysprofTimeSeriesItem *self);
|
gint64 sysprof_time_series_item_get_begin_time (SysprofTimeSeriesItem *self);
|
||||||
SYSPROF_AVAILABLE_IN_ALL
|
SYSPROF_AVAILABLE_IN_ALL
|
||||||
gint64 sysprof_time_series_item_get_duration (SysprofTimeSeriesItem *self);
|
gint64 sysprof_time_series_item_get_duration (SysprofTimeSeriesItem *self);
|
||||||
SYSPROF_AVAILABLE_IN_ALL
|
SYSPROF_AVAILABLE_IN_ALL
|
||||||
|
|||||||
@ -27,8 +27,8 @@
|
|||||||
struct _SysprofTimeSeries
|
struct _SysprofTimeSeries
|
||||||
{
|
{
|
||||||
SysprofSeries parent_instance;
|
SysprofSeries parent_instance;
|
||||||
GtkExpression *time_expression;
|
GtkExpression *begin_time_expression;
|
||||||
GtkExpression *duration_expression;
|
GtkExpression *end_time_expression;
|
||||||
GtkExpression *label_expression;
|
GtkExpression *label_expression;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -39,9 +39,9 @@ struct _SysprofTimeSeriesClass
|
|||||||
|
|
||||||
enum {
|
enum {
|
||||||
PROP_0,
|
PROP_0,
|
||||||
PROP_DURATION_EXPRESSION,
|
PROP_BEGIN_TIME_EXPRESSION,
|
||||||
|
PROP_END_TIME_EXPRESSION,
|
||||||
PROP_LABEL_EXPRESSION,
|
PROP_LABEL_EXPRESSION,
|
||||||
PROP_TIME_EXPRESSION,
|
|
||||||
N_PROPS
|
N_PROPS
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -57,8 +57,8 @@ sysprof_time_series_get_series_item (SysprofSeries *series,
|
|||||||
SysprofTimeSeries *self = SYSPROF_TIME_SERIES (series);
|
SysprofTimeSeries *self = SYSPROF_TIME_SERIES (series);
|
||||||
|
|
||||||
return _sysprof_time_series_item_new (item,
|
return _sysprof_time_series_item_new (item,
|
||||||
gtk_expression_ref (self->time_expression),
|
gtk_expression_ref (self->begin_time_expression),
|
||||||
gtk_expression_ref (self->duration_expression));
|
gtk_expression_ref (self->end_time_expression));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -66,9 +66,9 @@ sysprof_time_series_finalize (GObject *object)
|
|||||||
{
|
{
|
||||||
SysprofTimeSeries *self = (SysprofTimeSeries *)object;
|
SysprofTimeSeries *self = (SysprofTimeSeries *)object;
|
||||||
|
|
||||||
g_clear_pointer (&self->duration_expression, gtk_expression_unref);
|
g_clear_pointer (&self->end_time_expression, gtk_expression_unref);
|
||||||
g_clear_pointer (&self->label_expression, gtk_expression_unref);
|
g_clear_pointer (&self->label_expression, gtk_expression_unref);
|
||||||
g_clear_pointer (&self->time_expression, gtk_expression_unref);
|
g_clear_pointer (&self->begin_time_expression, gtk_expression_unref);
|
||||||
|
|
||||||
G_OBJECT_CLASS (sysprof_time_series_parent_class)->finalize (object);
|
G_OBJECT_CLASS (sysprof_time_series_parent_class)->finalize (object);
|
||||||
}
|
}
|
||||||
@ -83,12 +83,12 @@ sysprof_time_series_get_property (GObject *object,
|
|||||||
|
|
||||||
switch (prop_id)
|
switch (prop_id)
|
||||||
{
|
{
|
||||||
case PROP_TIME_EXPRESSION:
|
case PROP_BEGIN_TIME_EXPRESSION:
|
||||||
gtk_value_set_expression (value, self->time_expression);
|
gtk_value_set_expression (value, self->begin_time_expression);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_DURATION_EXPRESSION:
|
case PROP_END_TIME_EXPRESSION:
|
||||||
gtk_value_set_expression (value, self->duration_expression);
|
gtk_value_set_expression (value, self->end_time_expression);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_LABEL_EXPRESSION:
|
case PROP_LABEL_EXPRESSION:
|
||||||
@ -110,12 +110,12 @@ sysprof_time_series_set_property (GObject *object,
|
|||||||
|
|
||||||
switch (prop_id)
|
switch (prop_id)
|
||||||
{
|
{
|
||||||
case PROP_TIME_EXPRESSION:
|
case PROP_BEGIN_TIME_EXPRESSION:
|
||||||
sysprof_time_series_set_time_expression (self, gtk_value_get_expression (value));
|
sysprof_time_series_set_begin_time_expression (self, gtk_value_get_expression (value));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_DURATION_EXPRESSION:
|
case PROP_END_TIME_EXPRESSION:
|
||||||
sysprof_time_series_set_duration_expression (self, gtk_value_get_expression (value));
|
sysprof_time_series_set_end_time_expression (self, gtk_value_get_expression (value));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_LABEL_EXPRESSION:
|
case PROP_LABEL_EXPRESSION:
|
||||||
@ -140,12 +140,12 @@ sysprof_time_series_class_init (SysprofTimeSeriesClass *klass)
|
|||||||
series_class->series_item_type = SYSPROF_TYPE_TIME_SERIES_ITEM;
|
series_class->series_item_type = SYSPROF_TYPE_TIME_SERIES_ITEM;
|
||||||
series_class->get_series_item = sysprof_time_series_get_series_item;
|
series_class->get_series_item = sysprof_time_series_get_series_item;
|
||||||
|
|
||||||
properties [PROP_TIME_EXPRESSION] =
|
properties [PROP_BEGIN_TIME_EXPRESSION] =
|
||||||
gtk_param_spec_expression ("time-expression", NULL, NULL,
|
gtk_param_spec_expression ("begin-time-expression", NULL, NULL,
|
||||||
(G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS));
|
(G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS));
|
||||||
|
|
||||||
properties [PROP_DURATION_EXPRESSION] =
|
properties [PROP_END_TIME_EXPRESSION] =
|
||||||
gtk_param_spec_expression ("duration-expression", NULL, NULL,
|
gtk_param_spec_expression ("end-time-expression", NULL, NULL,
|
||||||
(G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS));
|
(G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS));
|
||||||
|
|
||||||
properties [PROP_LABEL_EXPRESSION] =
|
properties [PROP_LABEL_EXPRESSION] =
|
||||||
@ -164,10 +164,10 @@ sysprof_time_series_init (SysprofTimeSeries *self)
|
|||||||
* sysprof_time_series_new:
|
* sysprof_time_series_new:
|
||||||
* @title: (nullable): a title for the series
|
* @title: (nullable): a title for the series
|
||||||
* @model: (transfer full) (nullable): a #GListModel for the series
|
* @model: (transfer full) (nullable): a #GListModel for the series
|
||||||
* @time_expression: (transfer full) (nullable): a #GtkExpression for
|
* @begin_time_expression: (transfer full) (nullable): a #GtkExpression for
|
||||||
* extracting the time value from @model items.
|
* extracting the begin time value from @model items.
|
||||||
* @duration_expression: (transfer full) (nullable): a #GtkExpression for
|
* @end_time_expression: (transfer full) (nullable): a #GtkExpression for
|
||||||
* extracting the duration value from @model items.
|
* extracting the end time value from @model items.
|
||||||
* @label_expression: (transfer full) (nullable): a #GtkExpression for
|
* @label_expression: (transfer full) (nullable): a #GtkExpression for
|
||||||
* extracting the label from @model items.
|
* extracting the label from @model items.
|
||||||
*
|
*
|
||||||
@ -178,8 +178,8 @@ sysprof_time_series_init (SysprofTimeSeries *self)
|
|||||||
SysprofSeries *
|
SysprofSeries *
|
||||||
sysprof_time_series_new (const char *title,
|
sysprof_time_series_new (const char *title,
|
||||||
GListModel *model,
|
GListModel *model,
|
||||||
GtkExpression *time_expression,
|
GtkExpression *begin_time_expression,
|
||||||
GtkExpression *duration_expression,
|
GtkExpression *end_time_expression,
|
||||||
GtkExpression *label_expression)
|
GtkExpression *label_expression)
|
||||||
{
|
{
|
||||||
SysprofTimeSeries *xy;
|
SysprofTimeSeries *xy;
|
||||||
@ -187,13 +187,13 @@ sysprof_time_series_new (const char *title,
|
|||||||
xy = g_object_new (SYSPROF_TYPE_TIME_SERIES,
|
xy = g_object_new (SYSPROF_TYPE_TIME_SERIES,
|
||||||
"title", title,
|
"title", title,
|
||||||
"model", model,
|
"model", model,
|
||||||
"time-expression", time_expression,
|
"begin-time-expression", begin_time_expression,
|
||||||
"duration-expression", duration_expression,
|
"end-time-expression", end_time_expression,
|
||||||
"label-expression", label_expression,
|
"label-expression", label_expression,
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
g_clear_pointer (&time_expression, gtk_expression_unref);
|
g_clear_pointer (&begin_time_expression, gtk_expression_unref);
|
||||||
g_clear_pointer (&duration_expression, gtk_expression_unref);
|
g_clear_pointer (&end_time_expression, gtk_expression_unref);
|
||||||
g_clear_pointer (&label_expression, gtk_expression_unref);
|
g_clear_pointer (&label_expression, gtk_expression_unref);
|
||||||
g_clear_object (&model);
|
g_clear_object (&model);
|
||||||
|
|
||||||
@ -201,7 +201,7 @@ sysprof_time_series_new (const char *title,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* sysprof_time_series_get_time_expression:
|
* sysprof_time_series_get_begin_time_expression:
|
||||||
* @self: a #SysprofTimeSeries
|
* @self: a #SysprofTimeSeries
|
||||||
*
|
*
|
||||||
* Gets the #SysprofTimeSeries:x-expression property.
|
* Gets the #SysprofTimeSeries:x-expression property.
|
||||||
@ -211,34 +211,34 @@ sysprof_time_series_new (const char *title,
|
|||||||
* Returns: (transfer none) (nullable): a #GtkExpression or %NULL
|
* Returns: (transfer none) (nullable): a #GtkExpression or %NULL
|
||||||
*/
|
*/
|
||||||
GtkExpression *
|
GtkExpression *
|
||||||
sysprof_time_series_get_time_expression (SysprofTimeSeries *self)
|
sysprof_time_series_get_begin_time_expression (SysprofTimeSeries *self)
|
||||||
{
|
{
|
||||||
g_return_val_if_fail (SYSPROF_IS_TIME_SERIES (self), NULL);
|
g_return_val_if_fail (SYSPROF_IS_TIME_SERIES (self), NULL);
|
||||||
|
|
||||||
return self->time_expression;
|
return self->begin_time_expression;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
sysprof_time_series_set_time_expression (SysprofTimeSeries *self,
|
sysprof_time_series_set_begin_time_expression (SysprofTimeSeries *self,
|
||||||
GtkExpression *time_expression)
|
GtkExpression *begin_time_expression)
|
||||||
{
|
{
|
||||||
g_return_if_fail (SYSPROF_IS_TIME_SERIES (self));
|
g_return_if_fail (SYSPROF_IS_TIME_SERIES (self));
|
||||||
|
|
||||||
if (self->time_expression == time_expression)
|
if (self->begin_time_expression == begin_time_expression)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (time_expression)
|
if (begin_time_expression)
|
||||||
gtk_expression_ref (time_expression);
|
gtk_expression_ref (begin_time_expression);
|
||||||
|
|
||||||
g_clear_pointer (&self->time_expression, gtk_expression_unref);
|
g_clear_pointer (&self->begin_time_expression, gtk_expression_unref);
|
||||||
|
|
||||||
self->time_expression = time_expression;
|
self->begin_time_expression = begin_time_expression;
|
||||||
|
|
||||||
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_TIME_EXPRESSION]);
|
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_BEGIN_TIME_EXPRESSION]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* sysprof_time_series_get_duration_expression:
|
* sysprof_time_series_get_end_time_expression:
|
||||||
* @self: a #SysprofTimeSeries
|
* @self: a #SysprofTimeSeries
|
||||||
*
|
*
|
||||||
* Gets the #SysprofTimeSeries:y-expression property.
|
* Gets the #SysprofTimeSeries:y-expression property.
|
||||||
@ -248,30 +248,30 @@ sysprof_time_series_set_time_expression (SysprofTimeSeries *self,
|
|||||||
* Returns: (transfer none) (nullable): a #GtkExpression or %NULL
|
* Returns: (transfer none) (nullable): a #GtkExpression or %NULL
|
||||||
*/
|
*/
|
||||||
GtkExpression *
|
GtkExpression *
|
||||||
sysprof_time_series_get_duration_expression (SysprofTimeSeries *self)
|
sysprof_time_series_get_end_time_expression (SysprofTimeSeries *self)
|
||||||
{
|
{
|
||||||
g_return_val_if_fail (SYSPROF_IS_TIME_SERIES (self), NULL);
|
g_return_val_if_fail (SYSPROF_IS_TIME_SERIES (self), NULL);
|
||||||
|
|
||||||
return self->duration_expression;
|
return self->end_time_expression;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
sysprof_time_series_set_duration_expression (SysprofTimeSeries *self,
|
sysprof_time_series_set_end_time_expression (SysprofTimeSeries *self,
|
||||||
GtkExpression *duration_expression)
|
GtkExpression *end_time_expression)
|
||||||
{
|
{
|
||||||
g_return_if_fail (SYSPROF_IS_TIME_SERIES (self));
|
g_return_if_fail (SYSPROF_IS_TIME_SERIES (self));
|
||||||
|
|
||||||
if (self->duration_expression == duration_expression)
|
if (self->end_time_expression == end_time_expression)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (duration_expression)
|
if (end_time_expression)
|
||||||
gtk_expression_ref (duration_expression);
|
gtk_expression_ref (end_time_expression);
|
||||||
|
|
||||||
g_clear_pointer (&self->duration_expression, gtk_expression_unref);
|
g_clear_pointer (&self->end_time_expression, gtk_expression_unref);
|
||||||
|
|
||||||
self->duration_expression = duration_expression;
|
self->end_time_expression = end_time_expression;
|
||||||
|
|
||||||
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_DURATION_EXPRESSION]);
|
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_END_TIME_EXPRESSION]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -35,31 +35,31 @@ typedef struct _SysprofTimeSeries SysprofTimeSeries;
|
|||||||
typedef struct _SysprofTimeSeriesClass SysprofTimeSeriesClass;
|
typedef struct _SysprofTimeSeriesClass SysprofTimeSeriesClass;
|
||||||
|
|
||||||
SYSPROF_AVAILABLE_IN_ALL
|
SYSPROF_AVAILABLE_IN_ALL
|
||||||
GType sysprof_time_series_get_type (void) G_GNUC_CONST;
|
GType sysprof_time_series_get_type (void) G_GNUC_CONST;
|
||||||
SYSPROF_AVAILABLE_IN_ALL
|
SYSPROF_AVAILABLE_IN_ALL
|
||||||
SysprofSeries *sysprof_time_series_new (const char *title,
|
SysprofSeries *sysprof_time_series_new (const char *title,
|
||||||
GListModel *model,
|
GListModel *model,
|
||||||
GtkExpression *time_expression,
|
GtkExpression *begin_time_expression,
|
||||||
GtkExpression *duration_expression,
|
GtkExpression *end_time_expression,
|
||||||
GtkExpression *label_expression);
|
GtkExpression *label_expression);
|
||||||
SYSPROF_AVAILABLE_IN_ALL
|
SYSPROF_AVAILABLE_IN_ALL
|
||||||
GtkExpression *sysprof_time_series_get_time_expression (SysprofTimeSeries *self);
|
GtkExpression *sysprof_time_series_get_begin_time_expression (SysprofTimeSeries *self);
|
||||||
SYSPROF_AVAILABLE_IN_ALL
|
SYSPROF_AVAILABLE_IN_ALL
|
||||||
void sysprof_time_series_set_time_expression (SysprofTimeSeries *self,
|
void sysprof_time_series_set_begin_time_expression (SysprofTimeSeries *self,
|
||||||
GtkExpression *time_expression);
|
GtkExpression *time_expression);
|
||||||
SYSPROF_AVAILABLE_IN_ALL
|
SYSPROF_AVAILABLE_IN_ALL
|
||||||
GtkExpression *sysprof_time_series_get_duration_expression (SysprofTimeSeries *self);
|
GtkExpression *sysprof_time_series_get_end_time_expression (SysprofTimeSeries *self);
|
||||||
SYSPROF_AVAILABLE_IN_ALL
|
SYSPROF_AVAILABLE_IN_ALL
|
||||||
void sysprof_time_series_set_duration_expression (SysprofTimeSeries *self,
|
void sysprof_time_series_set_end_time_expression (SysprofTimeSeries *self,
|
||||||
GtkExpression *duration_expression);
|
GtkExpression *end_time_expression);
|
||||||
SYSPROF_AVAILABLE_IN_ALL
|
SYSPROF_AVAILABLE_IN_ALL
|
||||||
GtkExpression *sysprof_time_series_get_label_expression (SysprofTimeSeries *self);
|
GtkExpression *sysprof_time_series_get_label_expression (SysprofTimeSeries *self);
|
||||||
SYSPROF_AVAILABLE_IN_ALL
|
SYSPROF_AVAILABLE_IN_ALL
|
||||||
void sysprof_time_series_set_label_expression (SysprofTimeSeries *self,
|
void sysprof_time_series_set_label_expression (SysprofTimeSeries *self,
|
||||||
GtkExpression *label_expression);
|
GtkExpression *label_expression);
|
||||||
SYSPROF_AVAILABLE_IN_ALL
|
SYSPROF_AVAILABLE_IN_ALL
|
||||||
char *sysprof_time_series_dup_label (SysprofTimeSeries *self,
|
char *sysprof_time_series_dup_label (SysprofTimeSeries *self,
|
||||||
guint position);
|
guint position);
|
||||||
|
|
||||||
G_DEFINE_AUTOPTR_CLEANUP_FUNC (SysprofTimeSeries, g_object_unref)
|
G_DEFINE_AUTOPTR_CLEANUP_FUNC (SysprofTimeSeries, g_object_unref)
|
||||||
|
|
||||||
|
|||||||
@ -426,10 +426,10 @@ sysprof_time_span_layer_init (SysprofTimeSpanLayer *self)
|
|||||||
G_CONNECT_SWAPPED);
|
G_CONNECT_SWAPPED);
|
||||||
|
|
||||||
self->series_bindings = g_binding_group_new ();
|
self->series_bindings = g_binding_group_new ();
|
||||||
g_binding_group_bind (self->series_bindings, "time-expression",
|
g_binding_group_bind (self->series_bindings, "begin-time-expression",
|
||||||
self->normal_x, "expression",
|
self->normal_x, "expression",
|
||||||
G_BINDING_SYNC_CREATE);
|
G_BINDING_SYNC_CREATE);
|
||||||
g_binding_group_bind (self->series_bindings, "duration-expression",
|
g_binding_group_bind (self->series_bindings, "end-time-expression",
|
||||||
self->normal_x2, "expression",
|
self->normal_x2, "expression",
|
||||||
G_BINDING_SYNC_CREATE);
|
G_BINDING_SYNC_CREATE);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -57,11 +57,11 @@
|
|||||||
</binding>
|
</binding>
|
||||||
</object>
|
</object>
|
||||||
</property>
|
</property>
|
||||||
<property name="time-expression">
|
<property name="begin-time-expression">
|
||||||
<lookup name="time" type="SysprofDocumentFrame"/>
|
<lookup name="time" type="SysprofDocumentFrame"/>
|
||||||
</property>
|
</property>
|
||||||
<property name="duration-expression">
|
<property name="end-time-expression">
|
||||||
<lookup name="duration" type="SysprofDocumentProcess"/>
|
<lookup name="exit-time" type="SysprofDocumentProcess"/>
|
||||||
</property>
|
</property>
|
||||||
<property name="label-expression">
|
<property name="label-expression">
|
||||||
<lookup name="command-line" type="SysprofDocumentProcess"/>
|
<lookup name="command-line" type="SysprofDocumentProcess"/>
|
||||||
|
|||||||
@ -63,11 +63,11 @@
|
|||||||
</binding>
|
</binding>
|
||||||
</object>
|
</object>
|
||||||
</property>
|
</property>
|
||||||
<property name="time-expression">
|
<property name="begin-time-expression">
|
||||||
<lookup name="time" type="SysprofDocumentFrame"/>
|
<lookup name="time" type="SysprofDocumentFrame"/>
|
||||||
</property>
|
</property>
|
||||||
<property name="duration-expression">
|
<property name="end-time-expression">
|
||||||
<lookup name="duration" type="SysprofDocumentProcess"/>
|
<lookup name="exit-time" type="SysprofDocumentProcess"/>
|
||||||
</property>
|
</property>
|
||||||
<property name="label-expression">
|
<property name="label-expression">
|
||||||
<lookup name="command-line" type="SysprofDocumentProcess"/>
|
<lookup name="command-line" type="SysprofDocumentProcess"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user