sysprof: start on an energy section via RAPL/Battery Charge counters

This commit is contained in:
Christian Hergert
2023-07-26 12:07:09 -07:00
parent d8483691dc
commit ecacbc8c77
9 changed files with 738 additions and 0 deletions

View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 2 9 h 2 c 0.429688 0 0.8125 -0.277344 0.949219 -0.683594 l 2 -6 l -1.914063 -0.054687 l 3 11 c 0.113282 0.417969 0.480469 0.710937 0.90625 0.738281 c 0.429688 0.023438 0.828125 -0.230469 0.988282 -0.628906 l 2 -5 l -0.929688 0.628906 h 3 c 0.550781 0 1 -0.449219 1 -1 s -0.449219 -1 -1 -1 h -3 c -0.410156 0 -0.777344 0.25 -0.929688 0.628906 l -2 5 l 1.894532 0.109375 l -3 -11 c -0.117188 -0.425781 -0.496094 -0.726562 -0.9375 -0.738281 s -0.835938 0.265625 -0.976563 0.683594 l -2 6 l 0.949219 -0.683594 h -2 c -0.550781 0 -1 0.449219 -1 1 s 0.449219 1 1 1 z m 0 0"/></svg>

After

Width:  |  Height:  |  Size: 713 B

View File

@ -15,6 +15,7 @@ sysprof_sources = [
'sysprof-cpu-section.c',
'sysprof-css.c',
'sysprof-duplex-layer.c',
'sysprof-energy-section.c',
'sysprof-files-section.c',
'sysprof-frame-utility.c',
'sysprof-greeter.c',

View File

@ -0,0 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<template class="SysprofChartLayerItem">
<property name="layer">
<object class="SysprofLineLayer" id="layer">
<property name="spline">true</property>
<property name="fill">true</property>
<binding name="x-axis">
<lookup name="selected-time-axis" type="SysprofSession">
<lookup name="session" type="SysprofChart">
<lookup name="chart">layer</lookup>
</lookup>
</lookup>
</binding>
<property name="y-axis">
<object class="SysprofValueAxis">
<property name="min-value">0</property>
<property name="max-value">100</property>
</object>
</property>
<property name="series">
<object class="SysprofXYSeries">
<property name="model">
<object class="SysprofTimeFilterModel">
<binding name="time-span">
<lookup name="selected-time" type="SysprofSession">
<lookup name="session" type="SysprofSessionModelItem">
<lookup name="item">SysprofChartLayerItem</lookup>
</lookup>
</lookup>
</binding>
<binding name="model">
<lookup name="item" type="SysprofSessionModelItem">
<lookup name="item">SysprofChartLayerItem</lookup>
</lookup>
</binding>
</object>
</property>
<property name="x-expression">
<lookup name="time" type="SysprofDocumentCounterValue"/>
</property>
<property name="y-expression">
<lookup name="value-double" type="SysprofDocumentCounterValue"/>
</property>
</object>
</property>
</object>
</property>
</template>
</interface>

View File

@ -0,0 +1,84 @@
/* sysprof-energy-section.c
*
* Copyright 2023 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
*/
#include "config.h"
#include "sysprof-chart.h"
#include "sysprof-energy-section.h"
#include "sysprof-line-layer.h"
#include "sysprof-time-filter-model.h"
#include "sysprof-time-scrubber.h"
#include "sysprof-time-series.h"
#include "sysprof-time-span-layer.h"
#include "sysprof-value-axis.h"
#include "sysprof-xy-series.h"
struct _SysprofEnergySection
{
SysprofSection parent_instance;
SysprofTimeScrubber *scrubber;
GtkColumnView *column_view;
GtkColumnViewColumn *time_column;
};
G_DEFINE_FINAL_TYPE (SysprofEnergySection, sysprof_energy_section, SYSPROF_TYPE_SECTION)
static void
sysprof_energy_section_dispose (GObject *object)
{
SysprofEnergySection *self = (SysprofEnergySection *)object;
gtk_widget_dispose_template (GTK_WIDGET (self), SYSPROF_TYPE_ENERGY_SECTION);
G_OBJECT_CLASS (sysprof_energy_section_parent_class)->dispose (object);
}
static void
sysprof_energy_section_class_init (SysprofEnergySectionClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
object_class->dispose = sysprof_energy_section_dispose;
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/sysprof/sysprof-energy-section.ui");
gtk_widget_class_bind_template_child (widget_class, SysprofEnergySection, column_view);
gtk_widget_class_bind_template_child (widget_class, SysprofEnergySection, scrubber);
gtk_widget_class_bind_template_child (widget_class, SysprofEnergySection, time_column);
g_type_ensure (SYSPROF_TYPE_CHART);
g_type_ensure (SYSPROF_TYPE_DOCUMENT_MARK);
g_type_ensure (SYSPROF_TYPE_DOCUMENT_COUNTER);
g_type_ensure (SYSPROF_TYPE_DOCUMENT_COUNTER_VALUE);
g_type_ensure (SYSPROF_TYPE_LINE_LAYER);
g_type_ensure (SYSPROF_TYPE_TIME_SERIES);
g_type_ensure (SYSPROF_TYPE_TIME_SPAN_LAYER);
g_type_ensure (SYSPROF_TYPE_XY_SERIES);
}
static void
sysprof_energy_section_init (SysprofEnergySection *self)
{
gtk_widget_init_template (GTK_WIDGET (self));
gtk_column_view_sort_by_column (self->column_view, self->time_column, GTK_SORT_ASCENDING);
}

View File

@ -0,0 +1,32 @@
/* sysprof-energy-section.h
*
* Copyright 2023 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-section.h"
G_BEGIN_DECLS
#define SYSPROF_TYPE_ENERGY_SECTION (sysprof_energy_section_get_type())
G_DECLARE_FINAL_TYPE (SysprofEnergySection, sysprof_energy_section, SYSPROF, ENERG_SECTION, SysprofSection)
G_END_DECLS

View File

@ -0,0 +1,554 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<template class="SysprofEnergySection" parent="SysprofSection">
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="SysprofTimeScrubber" id="scrubber">
<binding name="session">
<lookup name="session">SysprofEnergySection</lookup>
</binding>
<child type="chart">
<object class="SysprofChart">
<binding name="session">
<lookup name="session">SysprofEnergySection</lookup>
</binding>
<property name="height-request">32</property>
<property name="model">
<object class="GtkFilterListModel">
<binding name="model">
<lookup name="counters" type="SysprofDocument">
<lookup name="document" type="SysprofSession">
<lookup name="session">SysprofEnergySection</lookup>
</lookup>
</lookup>
</binding>
<property name="filter">
<object class="GtkStringFilter">
<property name="match-mode">exact</property>
<property name="search">RAPL</property>
<property name="expression">
<lookup name="category" type="SysprofDocumentCounter"/>
</property>
</object>
</property>
</object>
</property>
<property name="factory">
<object class="SysprofChartLayerFactory">
<property name="bytes"><![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<template class="SysprofChartLayerItem">
<property name="layer">
<object class="SysprofLineLayer" id="layer">
<property name="dashed">true</property>
<property name="spline">true</property>
<binding name="x-axis">
<lookup name="visible-time-axis" type="SysprofSession">
<lookup name="session" type="SysprofChart">
<lookup name="chart">layer</lookup>
</lookup>
</lookup>
</binding>
<property name="y-axis">
<object class="SysprofValueAxis">
<property name="min-value">0</property>
<property name="max-value">100</property>
</object>
</property>
<property name="series">
<object class="SysprofXYSeries">
<binding name="model">
<lookup name="item">SysprofChartLayerItem</lookup>
</binding>
<property name="x-expression">
<lookup name="time" type="SysprofDocumentCounterValue"/>
</property>
<property name="y-expression">
<lookup name="value-double" type="SysprofDocumentCounterValue"/>
</property>
</object>
</property>
</object>
</property>
</template>
</interface>
]]>
</property>
</object>
</property>
</object>
</child>
<child type="chart">
<object class="GtkSeparator"/>
</child>
<child type="chart">
<object class="SysprofChart">
<binding name="session">
<lookup name="session">SysprofEnergySection</lookup>
</binding>
<property name="height-request">32</property>
<property name="model">
<object class="GtkFilterListModel">
<binding name="model">
<lookup name="counters" type="SysprofDocument">
<lookup name="document" type="SysprofSession">
<lookup name="session">SysprofEnergySection</lookup>
</lookup>
</lookup>
</binding>
<property name="filter">
<object class="GtkStringFilter">
<property name="match-mode">exact</property>
<property name="search">Battery Charge/Combined</property>
<property name="expression">
<lookup name="key" type="SysprofDocumentCounter"/>
</property>
</object>
</property>
</object>
</property>
<property name="factory">
<object class="SysprofChartLayerFactory">
<property name="bytes"><![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<template class="SysprofChartLayerItem">
<property name="layer">
<object class="SysprofLineLayer" id="layer">
<property name="spline">true</property>
<property name="fill">true</property>
<binding name="x-axis">
<lookup name="visible-time-axis" type="SysprofSession">
<lookup name="session" type="SysprofChart">
<lookup name="chart">layer</lookup>
</lookup>
</lookup>
</binding>
<property name="y-axis">
<object class="SysprofValueAxis">
<binding name="min-value">
<lookup name="min-value" type="SysprofDocumentCounter">
<lookup name="item" type="SysprofChart">
<lookup name="chart">layer</lookup>
</lookup>
</lookup>
</binding>
<binding name="max-value">
<lookup name="max-value" type="SysprofDocumentCounter">
<lookup name="item" type="SysprofChart">
<lookup name="chart">layer</lookup>
</lookup>
</lookup>
</binding>
</object>
</property>
<property name="series">
<object class="SysprofXYSeries">
<binding name="model">
<lookup name="item">SysprofChartLayerItem</lookup>
</binding>
<property name="x-expression">
<lookup name="time" type="SysprofDocumentCounterValue"/>
</property>
<property name="y-expression">
<lookup name="value-double" type="SysprofDocumentCounterValue"/>
</property>
</object>
</property>
</object>
</property>
</template>
</interface>
]]>
</property>
</object>
</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkSeparator"/>
</child>
<child>
<object class="AdwViewStack" id="stack">
<property name="vexpand">true</property>
<child>
<object class="AdwViewStackPage">
<property name="title" translatable="yes">Counters Chart</property>
<property name="icon-name">mark-chart-symbolic</property>
<property name="child">
<object class="GtkScrolledWindow">
<child>
<object class="GtkListView">
<property name="header-factory">
<object class="GtkBuilderListItemFactory">
<property name="bytes"><![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<template class="GtkListHeader">
<property name="child">
<object class="GtkLabel">
<property name="xalign">0</property>
<property name="margin-start">12</property>
<binding name="label">
<lookup name="category" type="SysprofDocumentCounter">
<lookup name="item" type="SysprofSessionModelItem">
<lookup name="item">GtkListHeader</lookup>
</lookup>
</lookup>
</binding>
</object>
</property>
</template>
</interface>
]]>
</property>
</object>
</property>
<property name="model">
<object class="GtkNoSelection">
<property name="model">
<object class="GtkSortListModel">
<property name="sorter">
<object class="GtkStringSorter">
<property name="expression">
<lookup name="key" type="SysprofDocumentCounter">
<lookup name="item" type="SysprofSessionModelItem"/>
</lookup>
</property>
</object>
</property>
<property name="section-sorter">
<object class="GtkStringSorter">
<property name="expression">
<lookup name="category" type="SysprofDocumentCounter">
<lookup name="item" type="SysprofSessionModelItem"/>
</lookup>
</property>
</object>
</property>
<property name="model">
<object class="SysprofSessionModel">
<binding name="session">
<lookup name="session">SysprofEnergySection</lookup>
</binding>
<property name="model">
<object class="GtkFilterListModel">
<binding name="model">
<lookup name="counters" type="SysprofDocument">
<lookup name="document" type="SysprofSession">
<lookup name="session">SysprofEnergySection</lookup>
</lookup>
</lookup>
</binding>
<property name="filter">
<object class="GtkStringFilter">
<property name="match-mode">prefix</property>
<property name="search">RAPL</property>
<property name="expression">
<lookup name="key" type="SysprofDocumentCounter"/>
</property>
</object>
</property>
</object>
</property>
</object>
</property>
</object>
</property>
</object>
</property>
<property name="factory">
<object class="GtkBuilderListItemFactory">
<property name="bytes"><![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<template class="GtkListItem">
<property name="child">
<object class="GtkBox">
<property name="spacing">6</property>
<child>
<object class="GtkInscription">
<property name="xalign">1</property>
<property name="min-chars">20</property>
<property name="nat-chars">20</property>
<property name="text-overflow">ellipsize-end</property>
<binding name="tooltip-text">
<lookup name="description" type="SysprofDocumentCounter">
<lookup name="item" type="SysprofSessionModelItem">
<lookup name="item">GtkListItem</lookup>
</lookup>
</lookup>
</binding>
<binding name="text">
<lookup name="name" type="SysprofDocumentCounter">
<lookup name="item" type="SysprofSessionModelItem">
<lookup name="item">GtkListItem</lookup>
</lookup>
</lookup>
</binding>
</object>
</child>
<child>
<object class="SysprofChart">
<property name="hexpand">true</property>
<property name="height-request">24</property>
<binding name="session">
<lookup name="session" type="SysprofSessionModelItem">
<lookup name="item">GtkListItem</lookup>
</lookup>
</binding>
<property name="model">
<object class="SysprofSingleModel">
<binding name="item">
<lookup name="item">GtkListItem</lookup>
</binding>
</object>
</property>
<property name="factory">
<object class="SysprofChartLayerFactory">
<property name="resource">/org/gnome/sysprof/sysprof-energy-section-counter.ui</property>
</object>
</property>
</object>
</child>
</object>
</property>
</template>
</interface>
]]>
</property>
</object>
</property>
</object>
</child>
</object>
</property>
</object>
</child>
<child>
<object class="AdwViewStackPage">
<property name="title" translatable="yes">Counters Table</property>
<property name="icon-name">mark-table-symbolic</property>
<property name="child">
<object class="GtkScrolledWindow">
<child>
<object class="GtkColumnView" id="column_view">
<style>
<class name="data-table"/>
</style>
<property name="show-column-separators">true</property>
<property name="show-row-separators">true</property>
<property name="model">
<object class="GtkNoSelection">
<property name="model">
<object class="GtkSortListModel">
<binding name="sorter">
<lookup name="sorter">column_view</lookup>
</binding>
<property name="model">
<object class="SysprofTimeFilterModel">
<property name="expression">
<lookup name="time" type="SysprofDocumentCounterValue"/>
</property>
<property name="model">
<object class="GtkFlattenListModel">
<property name="model">
<object class="GtkFilterListModel">
<property name="filter">
<object class="GtkStringFilter">
<property name="match-mode">prefix</property>
<property name="search">RAPL</property>
<property name="expression">
<lookup name="category" type="SysprofDocumentCounter"/>
</property>
</object>
</property>
<binding name="model">
<lookup name="counters" type="SysprofDocument">
<lookup name="document" type="SysprofSession">
<lookup name="session">SysprofEnergySection</lookup>
</lookup>
</lookup>
</binding>
</object>
</property>
</object>
</property>
</object>
</property>
</object>
</property>
</object>
</property>
<child>
<object class="GtkColumnViewColumn" id="time_column">
<property name="title" translatable="yes">Time</property>
<property name="sorter">
<object class="GtkNumericSorter">
<property name="sort-order">ascending</property>
<property name="expression">
<lookup name="time-offset" type="SysprofDocumentCounterValue"/>
</property>
</object>
</property>
<property name="factory">
<object class="GtkBuilderListItemFactory">
<property name="bytes"><![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<template class="GtkListItem">
<property name="child">
<object class="SysprofTimeLabel">
<binding name="time-offset">
<lookup name="time-offset" type="SysprofDocumentCounterValue">
<lookup name="item">GtkListItem</lookup>
</lookup>
</binding>
</object>
</property>
</template>
</interface>
]]>
</property>
</object>
</property>
</object>
</child>
<child>
<object class="GtkColumnViewColumn" id="category_column">
<property name="title" translatable="yes">Category</property>
<property name="sorter">
<object class="GtkStringSorter">
<property name="expression">
<lookup name="category" type="SysprofDocumentCounter">
<lookup name="counter" type="SysprofDocumentCounterValue"/>
</lookup>
</property>
</object>
</property>
<property name="factory">
<object class="GtkBuilderListItemFactory">
<property name="bytes"><![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<template class="GtkListItem">
<property name="child">
<object class="GtkLabel">
<property name="xalign">0</property>
<binding name="label">
<lookup name="category" type="SysprofDocumentCounter">
<lookup name="counter" type="SysprofDocumentCounterValue">
<lookup name="item">GtkListItem</lookup>
</lookup>
</lookup>
</binding>
</object>
</property>
</template>
</interface>
]]>
</property>
</object>
</property>
</object>
</child>
<child>
<object class="GtkColumnViewColumn" id="name_column">
<property name="title" translatable="yes">Name</property>
<property name="sorter">
<object class="GtkStringSorter">
<property name="expression">
<lookup name="name" type="SysprofDocumentCounter">
<lookup name="counter" type="SysprofDocumentCounterValue"/>
</lookup>
</property>
</object>
</property>
<property name="factory">
<object class="GtkBuilderListItemFactory">
<property name="bytes"><![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<template class="GtkListItem">
<property name="child">
<object class="GtkLabel">
<property name="xalign">0</property>
<binding name="label">
<lookup name="name" type="SysprofDocumentCounter">
<lookup name="counter" type="SysprofDocumentCounterValue">
<lookup name="item">GtkListItem</lookup>
</lookup>
</lookup>
</binding>
</object>
</property>
</template>
</interface>
]]>
</property>
</object>
</property>
</object>
</child>
<child>
<object class="GtkColumnViewColumn" id="value_column">
<property name="title" translatable="yes">Value</property>
<property name="expand">true</property>
<property name="sorter">
<object class="GtkNumericSorter">
<property name="expression">
<lookup name="value-double" type="SysprofDocumentCounterValue"/>
</property>
</object>
</property>
<property name="factory">
<object class="GtkBuilderListItemFactory">
<property name="bytes"><![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<template class="GtkListItem">
<property name="child">
<object class="GtkLabel">
<property name="xalign">0</property>
<binding name="label">
<lookup name="value-string" type="SysprofDocumentCounterValue">
<lookup name="item">GtkListItem</lookup>
</lookup>
</binding>
</object>
</property>
</template>
</interface>
]]>
</property>
</object>
</property>
</object>
</child>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</child>
<child>
<object class="AdwViewSwitcherBar" id="switcher">
<property name="reveal">true</property>
<property name="stack">stack</property>
</object>
</child>
</object>
</child>
</template>
</interface>

View File

@ -24,6 +24,7 @@
#include "sysprof-counters-section.h"
#include "sysprof-cpu-section.h"
#include "sysprof-energy-section.h"
#include "sysprof-files-section.h"
#include "sysprof-greeter.h"
#include "sysprof-logs-section.h"
@ -413,6 +414,7 @@ sysprof_window_class_init (SysprofWindowClass *klass)
g_type_ensure (SYSPROF_TYPE_COUNTERS_SECTION);
g_type_ensure (SYSPROF_TYPE_CPU_SECTION);
g_type_ensure (SYSPROF_TYPE_DOCUMENT);
g_type_ensure (SYSPROF_TYPE_ENERGY_SECTION);
g_type_ensure (SYSPROF_TYPE_FILES_SECTION);
g_type_ensure (SYSPROF_TYPE_LOGS_SECTION);
g_type_ensure (SYSPROF_TYPE_MARKS_SECTION);

View File

@ -216,6 +216,16 @@
</binding>
</object>
</child>
<child>
<object class="SysprofEnergySection">
<property name="title" translatable="yes">Energy</property>
<property name="category">counters</property>
<property name="icon-name">energy-symbolic</property>
<binding name="session">
<lookup name="session">SysprofWindow</lookup>
</binding>
</object>
</child>
<child>
<object class="SysprofNetworkSection">
<property name="title" translatable="yes">Network</property>

View File

@ -5,6 +5,7 @@
<file preprocess="xml-stripblanks">gtk/menus.ui</file>
<file preprocess="xml-stripblanks">icons/scalable/actions/address-layout-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/scalable/actions/empty-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/scalable/actions/energy-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/scalable/actions/mark-chart-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/scalable/actions/mark-table-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/scalable/actions/mark-waterfall-symbolic.svg</file>
@ -18,6 +19,8 @@
<file preprocess="xml-stripblanks">sysprof-counters-section.ui</file>
<file preprocess="xml-stripblanks">sysprof-cpu-section.ui</file>
<file preprocess="xml-stripblanks">sysprof-cpu-section-counter.ui</file>
<file preprocess="xml-stripblanks">sysprof-energy-section.ui</file>
<file preprocess="xml-stripblanks">sysprof-energy-section-counter.ui</file>
<file preprocess="xml-stripblanks">sysprof-files-section.ui</file>
<file preprocess="xml-stripblanks">sysprof-frame-utility.ui</file>
<file preprocess="xml-stripblanks">sysprof-greeter.ui</file>