varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2025-12-31 20:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu: discover cpu counters from SpCaptureReader

Browse Source 
This allows us to dynamically discover the cpu counters from the
capture by looking for the "CPU Total" category.
This commit is contained in:
Christian Hergert
2016-09-25 12:19:53 -07:00
parent 84c61c3344
commit 3b9ea07d31
6 changed files with 340 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

204
lib/sp-line-visualizer-row.c
View File

@ -16,6 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define G_LOG_DOMAIN "sp-line-visualizer-row"
#include <stdlib.h>
#include "sp-line-visualizer-row.h"
@ -33,23 +35,20 @@ typedef struct
GArray *values;
} LineData;
struct _SpLineVisualizerRow
typedef struct
{
SpVisualizerRow parent_instance;
SpCaptureReader *reader;
GHashTable *counters;
GtkLabel *label;
guint needs_recalc : 1;
gint64 start_time;
gint64 duration;
};
G_DEFINE_TYPE (SpLineVisualizerRow, sp_line_visualizer_row, SP_TYPE_VISUALIZER_ROW)
guint needs_recalc : 1;
} SpLineVisualizerRowPrivate;
G_DEFINE_TYPE_WITH_PRIVATE (SpLineVisualizerRow, sp_line_visualizer_row, SP_TYPE_VISUALIZER_ROW)
enum {
PROP_0,
@ -74,47 +73,56 @@ line_data_free (gpointer data)
static void
sp_line_visualizer_row_recalc (SpLineVisualizerRow *self)
{
SpLineVisualizerRowPrivate *priv = sp_line_visualizer_row_get_instance_private (self);
GHashTable *new_data;
SpCaptureFrame frame;
g_assert (SP_IS_LINE_VISUALIZER_ROW (self));
self->needs_recalc = FALSE;
/*
* TODO:
*
* We want to create an index that gives us quick access to this
* data without quite so much overhead that we have now. The 16
* bytes per data-point is pretty high.
*/
if (self->reader == NULL)
priv->needs_recalc = FALSE;
if (priv->reader == NULL)
return;
sp_capture_reader_reset (self->reader);
sp_capture_reader_reset (priv->reader);
self->start_time = sp_capture_reader_get_start_time (self->reader);
self->duration = 0;
priv->start_time = sp_capture_reader_get_start_time (priv->reader);
priv->duration = 0;
new_data = g_hash_table_new_full (NULL, NULL, NULL, line_data_free);
while (sp_capture_reader_peek_frame (self->reader, &frame))
while (sp_capture_reader_peek_frame (priv->reader, &frame))
{
gint64 relative;
if (frame.time < self->start_time)
frame.time = self->start_time;
if (frame.time < priv->start_time)
frame.time = priv->start_time;
relative = frame.time - self->start_time;
if (relative > self->duration)
self->duration = relative;
relative = frame.time - priv->start_time;
if (relative > priv->duration)
priv->duration = relative;
if (frame.type == SP_CAPTURE_FRAME_CTRDEF)
{
const SpCaptureFrameCounterDefine *def;
guint i;
if (NULL == (def = sp_capture_reader_read_counter_define (self->reader)))
if (NULL == (def = sp_capture_reader_read_counter_define (priv->reader)))
return;
for (i = 0; i < def->n_counters; i++)
{
const SpCaptureCounter *ctr = &def->counters[i];
if (g_hash_table_contains (self->counters, GSIZE_TO_POINTER (ctr->id)))
if (g_hash_table_contains (priv->counters, GSIZE_TO_POINTER (ctr->id)))
{
LineData *ld = g_hash_table_lookup (new_data, GSIZE_TO_POINTER (ctr->id));
LineDataItem item;
@ -128,7 +136,7 @@ sp_line_visualizer_row_recalc (SpLineVisualizerRow *self)
g_hash_table_insert (new_data, GSIZE_TO_POINTER (ctr->id), ld);
}
item.time = MAX (self->start_time, def->frame.time) - self->start_time;
item.time = MAX (priv->start_time, def->frame.time) - priv->start_time;
item.value = ctr->value;
g_array_append_val (ld->values, item);
@ -141,10 +149,10 @@ sp_line_visualizer_row_recalc (SpLineVisualizerRow *self)
LineDataItem item;
guint i;
if (NULL == (set = sp_capture_reader_read_counter_set (self->reader)))
if (NULL == (set = sp_capture_reader_read_counter_set (priv->reader)))
return;
item.time = MAX (self->start_time, set->frame.time) - self->start_time;
item.time = MAX (priv->start_time, set->frame.time) - priv->start_time;
for (i = 0; i < set->n_values; i++)
{
@ -170,20 +178,12 @@ sp_line_visualizer_row_recalc (SpLineVisualizerRow *self)
}
}
}
else if (!sp_capture_reader_skip (self->reader))
else if (!sp_capture_reader_skip (priv->reader))
return;
}
g_clear_pointer (&self->counters, g_hash_table_unref);
self->counters = new_data;
}
static inline gdouble
calc_x (SpLineVisualizerRow *self,
gint64 time)
{
gdouble ret = (gdouble)time / (gdouble)self->duration;
return ret;
g_clear_pointer (&priv->counters, g_hash_table_unref);
priv->counters = new_data;
}
static inline gdouble
@ -191,8 +191,7 @@ calc_y (SpLineVisualizerRow *self,
LineData *ld,
SpCaptureCounterValue value)
{
gdouble ret = value.vdbl / 100.0;
return ret;
return value.vdbl / 100.0;
}
static gboolean
@ -200,64 +199,55 @@ sp_line_visualizer_row_draw (GtkWidget *widget,
cairo_t *cr)
{
SpLineVisualizerRow *self = (SpLineVisualizerRow *)widget;
SpLineVisualizerRowPrivate *priv = sp_line_visualizer_row_get_instance_private (self);
GtkAllocation alloc;
GHashTableIter iter;
gdouble duration;
gboolean ret;
gpointer key, val;
guint i;
g_assert (SP_IS_LINE_VISUALIZER_ROW (widget));
g_assert (cr != NULL);
if (self->needs_recalc)
if (priv->needs_recalc)
sp_line_visualizer_row_recalc (self);
gtk_widget_get_allocation (widget, &alloc);
ret = GTK_WIDGET_CLASS (sp_line_visualizer_row_parent_class)->draw (widget, cr);
cairo_save (cr);
duration = (gdouble)priv->duration;
g_hash_table_iter_init (&iter, self->counters);
g_hash_table_iter_init (&iter, priv->counters);
while (g_hash_table_iter_next (&iter, &key, &val))
{
LineData *ld = val;
gdouble last_x = 0;
gdouble last_y = 0;
cairo_save (cr);
cairo_move_to (cr, 0, alloc.height);
for (i = 0; i < ld->values->len; i++)
for (guint i = 0; i < ld->values->len; i++)
{
LineDataItem *item = &g_array_index (ld->values, LineDataItem, i);
gdouble x;
gdouble y;
x = calc_x (self, item->time) * alloc.width;
y = alloc.height - (calc_y (self, ld, item->value) * alloc.height);
//g_print ("x=%d y =%d\n", (int)x, (int)y);
x = (item->time / duration) * alloc.width;
y = alloc.height - ((item->value.vdbl / 100.0) * alloc.height);
cairo_line_to (cr, x, y);
(void)last_x;
(void)last_y;
last_x = x;
last_y = x;
}
cairo_line_to (cr, alloc.width, alloc.height);
cairo_line_to (cr, 0, alloc.height);
cairo_set_line_width (cr, 1.0);
cairo_set_source_rgba (cr, 0, 0, 0, 0.4);
cairo_stroke_preserve (cr);
cairo_set_source_rgba (cr, 0, 0, 0, 0.2);
cairo_fill (cr);
}
cairo_restore (cr);
SP_LINE_VISUALIZER_ROW_GET_CLASS (self)->prepare (self, cr, ld->id);
cairo_stroke_preserve (cr);
cairo_fill (cr);
cairo_restore (cr);
}
return ret;
}
@ -267,37 +257,52 @@ sp_line_visualizer_row_set_reader (SpVisualizerRow *row,
SpCaptureReader *reader)
{
SpLineVisualizerRow *self = (SpLineVisualizerRow *)row;
SpLineVisualizerRowPrivate *priv = sp_line_visualizer_row_get_instance_private (self);
g_assert (SP_IS_LINE_VISUALIZER_ROW (self));
if (self->reader != reader)
if (priv->reader != reader)
{
g_clear_pointer (&self->reader, sp_capture_reader_unref);
if (priv->reader != NULL)
{
sp_capture_reader_unref (priv->reader);
priv->reader = NULL;
priv->start_time = 0;
priv->duration = 0;
}
if (reader)
{
self->reader = sp_capture_reader_ref (reader);
self->start_time = 0;
self->duration = 0;
}
/* TODO */
sp_line_visualizer_row_add_counter (self, 1);
sp_line_visualizer_row_add_counter (self, 3);
sp_line_visualizer_row_add_counter (self, 5);
sp_line_visualizer_row_add_counter (self, 7);
if (reader != NULL)
{
priv->reader = sp_capture_reader_ref (reader);
priv->start_time = 0;
priv->duration = 0;
priv->needs_recalc = TRUE;
}
gtk_widget_queue_draw (GTK_WIDGET (self));
}
}
static void
sp_line_visualizer_row_real_prepare (SpLineVisualizerRow *self,
cairo_t *cr,
guint counter_id)
{
g_assert (SP_IS_LINE_VISUALIZER_ROW (self));
g_assert (cr != NULL);
cairo_set_line_width (cr, 1.0);
cairo_set_source_rgba (cr, 0, 0, 0, 0.4);
}
static void
sp_line_visualizer_row_finalize (GObject *object)
{
SpLineVisualizerRow *self = (SpLineVisualizerRow *)object;
SpLineVisualizerRowPrivate *priv = sp_line_visualizer_row_get_instance_private (self);
g_clear_pointer (&self->counters, g_hash_table_unref);
g_clear_pointer (&self->reader, sp_capture_reader_unref);
g_clear_pointer (&priv->counters, g_hash_table_unref);
g_clear_pointer (&priv->reader, sp_capture_reader_unref);
G_OBJECT_CLASS (sp_line_visualizer_row_parent_class)->finalize (object);
}
@ -309,11 +314,12 @@ sp_line_visualizer_row_get_property (GObject *object,
GParamSpec *pspec)
{
SpLineVisualizerRow *self = SP_LINE_VISUALIZER_ROW (object);
SpLineVisualizerRowPrivate *priv = sp_line_visualizer_row_get_instance_private (self);
switch (prop_id)
{
case PROP_TITLE:
g_object_get_property (G_OBJECT (self->label), "label", value);
g_object_get_property (G_OBJECT (priv->label), "label", value);
break;
default:
@ -328,11 +334,12 @@ sp_line_visualizer_row_set_property (GObject *object,
GParamSpec *pspec)
{
SpLineVisualizerRow *self = SP_LINE_VISUALIZER_ROW (object);
SpLineVisualizerRowPrivate *priv = sp_line_visualizer_row_get_instance_private (self);
switch (prop_id)
{
case PROP_TITLE:
g_object_set_property (G_OBJECT (self->label), "label", value);
g_object_set_property (G_OBJECT (priv->label), "label", value);
break;
default:
@ -347,6 +354,8 @@ sp_line_visualizer_row_class_init (SpLineVisualizerRowClass *klass)
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
SpVisualizerRowClass *visualizer_class = SP_VISUALIZER_ROW_CLASS (klass);
klass->prepare = sp_line_visualizer_row_real_prepare;
object_class->finalize = sp_line_visualizer_row_finalize;
object_class->get_property = sp_line_visualizer_row_get_property;
object_class->set_property = sp_line_visualizer_row_set_property;
@ -368,19 +377,21 @@ sp_line_visualizer_row_class_init (SpLineVisualizerRowClass *klass)
static void
sp_line_visualizer_row_init (SpLineVisualizerRow *self)
{
PangoAttrList *attrs = NULL;
SpLineVisualizerRowPrivate *priv = sp_line_visualizer_row_get_instance_private (self);
PangoAttrList *attrs = pango_attr_list_new ();
self->counters = g_hash_table_new (NULL, NULL);
priv->counters = g_hash_table_new (NULL, NULL);
attrs = pango_attr_list_new ();
pango_attr_list_insert (attrs, pango_attr_scale_new (PANGO_SCALE_SMALL * PANGO_SCALE_SMALL));
self->label = g_object_new (GTK_TYPE_LABEL,
priv->label = g_object_new (GTK_TYPE_LABEL,
"attributes", attrs,
"visible", TRUE,
"xalign", 0.0f,
"yalign", 0.0f,
NULL);
gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (self->label));
gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (priv->label));
pango_attr_list_unref (attrs);
}
@ -388,9 +399,28 @@ void
sp_line_visualizer_row_add_counter (SpLineVisualizerRow *self,
guint counter_id)
{
g_assert (SP_IS_LINE_VISUALIZER_ROW (self));
SpLineVisualizerRowPrivate *priv = sp_line_visualizer_row_get_instance_private (self);
g_assert (SP_IS_LINE_VISUALIZER_ROW (self));
g_assert (priv->counters != NULL);
g_hash_table_insert (priv->counters, GSIZE_TO_POINTER (counter_id), NULL);
if (SP_LINE_VISUALIZER_ROW_GET_CLASS (self)->counter_added)
SP_LINE_VISUALIZER_ROW_GET_CLASS (self)->counter_added (self, counter_id);
priv->needs_recalc = TRUE;
self->needs_recalc = TRUE;
g_hash_table_insert (self->counters, GSIZE_TO_POINTER (counter_id), NULL);
gtk_widget_queue_draw (GTK_WIDGET (self));
}
void
sp_line_visualizer_row_clear (SpLineVisualizerRow *self)
{
SpLineVisualizerRowPrivate *priv = sp_line_visualizer_row_get_instance_private (self);
g_return_if_fail (SP_IS_LINE_VISUALIZER_ROW (self));
g_hash_table_remove_all (priv->counters);
gtk_widget_queue_resize (GTK_WIDGET (self));
}