sysprof: add graphics section

This commit is contained in:
Christian Hergert
2023-07-26 17:52:50 -07:00
parent b37e31b855
commit 70d151b5e8
10 changed files with 703 additions and 1 deletions

View File

@ -0,0 +1,114 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="org.gtk.Demo4-symbolic.svg"
height="16.03125"
id="svg7384"
inkscape:version="0.92.4 5da689c313, 2019-01-14"
version="1.1"
width="16">
<metadata
id="metadata90">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>Gnome Symbolic Icon Theme</dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
inkscape:bbox-paths="true"
bordercolor="#666666"
borderopacity="1"
inkscape:current-layer="layer9"
inkscape:cx="0.53203442"
inkscape:cy="9.1822592"
gridtolerance="10"
inkscape:guide-bbox="true"
guidetolerance="10"
id="namedview88"
inkscape:object-nodes="false"
inkscape:object-paths="false"
objecttolerance="10"
pagecolor="#555753"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
showborder="true"
showgrid="false"
showguides="true"
inkscape:snap-bbox="true"
inkscape:snap-bbox-midpoints="false"
inkscape:snap-global="true"
inkscape:snap-grids="true"
inkscape:snap-nodes="true"
inkscape:snap-others="false"
inkscape:snap-to-guides="true"
inkscape:window-height="1375"
inkscape:window-maximized="1"
inkscape:window-width="2560"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:zoom="1">
<inkscape:grid
empspacing="2"
enabled="true"
id="grid4866"
originx="-203"
originy="-251.96875"
snapvisiblegridlinesonly="true"
spacingx="1"
spacingy="1"
type="xygrid"
visible="true" />
</sodipodi:namedview>
<title
id="title9167">Gnome Symbolic Icon Theme</title>
<defs
id="defs7386">
<linearGradient
id="linearGradient7212"
osb:paint="solid">
<stop
id="stop7214"
offset="0"
style="stop-color:#000000;stop-opacity:1;" />
</linearGradient>
</defs>
<g
inkscape:groupmode="layer"
id="layer9"
inkscape:label="apps"
style="display:inline"
transform="translate(-444.0002,35)">
<path
style="display:inline;opacity:0.3;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
d="m 457.97232,-31.569556 -5.96212,3.44224 -5.96215,-3.44224 v 0 l 5.96215,-3.44226 z"
id="path870-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc" />
<path
sodipodi:nodetypes="cccccc"
inkscape:connector-curvature="0"
id="path886-9"
d="m 450.98519,-19.648086 -5.99273,-3.42041 -0.007,-6.97219 v 0 l 6.00018,3.4642 z"
style="display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" />
<path
style="display:inline;opacity:0.60100002;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
d="m 452.98577,-19.648086 5.99273,-3.42041 0.007,-6.97219 v 0 l -6.00018,3.4642 z"
id="path931"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

@ -18,6 +18,7 @@ sysprof_sources = [
'sysprof-energy-section.c',
'sysprof-files-section.c',
'sysprof-frame-utility.c',
'sysprof-graphics-section.c',
'sysprof-greeter.c',
'sysprof-line-layer.c',
'sysprof-logs-section.c',

View File

@ -81,4 +81,3 @@ sysprof_energy_section_init (SysprofEnergySection *self)
gtk_column_view_sort_by_column (self->column_view, self->time_column, GTK_SORT_ASCENDING);
}

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,55 @@
/* sysprof-graphics-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-graphics-section.h"
struct _SysprofGraphicsSection
{
SysprofSection parent_instance;
GtkColumnView *column_view;
GtkColumnViewColumn *time_column;
};
G_DEFINE_FINAL_TYPE (SysprofGraphicsSection, sysprof_graphics_section, SYSPROF_TYPE_SECTION)
static void
sysprof_graphics_section_class_init (SysprofGraphicsSectionClass *klass)
{
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/sysprof/sysprof-graphics-section.ui");
gtk_widget_class_bind_template_child (widget_class, SysprofGraphicsSection, column_view);
gtk_widget_class_bind_template_child (widget_class, SysprofGraphicsSection, time_column);
}
static void
sysprof_graphics_section_init (SysprofGraphicsSection *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,31 @@
/* sysprof-graphics-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_GRAPHICS_SECTION (sysprof_graphics_section_get_type())
G_DECLARE_FINAL_TYPE (SysprofGraphicsSection, sysprof_graphics_section, SYSPROF, GRAPHICS_SECTION, SysprofSection)
G_END_DECLS

View File

@ -0,0 +1,437 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<template class="SysprofGraphicsSection" parent="SysprofSection">
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="SysprofTimeScrubber" id="scrubber">
<binding name="session">
<lookup name="session">SysprofGraphicsSection</lookup>
</binding>
<child type="chart">
<object class="SysprofChart">
<binding name="session">
<lookup name="session">SysprofGraphicsSection</lookup>
</binding>
<property name="height-request">32</property>
<property name="model">
<object class="GtkFilterListModel">
<property name="model">graphics_counters</property>
<property name="filter">
<object class="GtkStringFilter">
<property name="match-mode">exact</property>
<property name="search">gtk/fps</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="fill">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">144</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>
</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">SysprofGraphicsSection</lookup>
</binding>
<property name="model">graphics_counters</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-graphics-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">graphics_counters</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>
<object class="GtkFilterListModel" id="graphics_counters">
<binding name="model">
<lookup name="counters" type="SysprofDocument">
<lookup name="document" type="SysprofSession">
<lookup name="session">SysprofGraphicsSection</lookup>
</lookup>
</lookup>
</binding>
<property name="filter">
<object class="GtkStringFilter">
<property name="match-mode">exact</property>
<property name="search">gtk</property>
<property name="expression">
<lookup name="category" type="SysprofDocumentCounter"/>
</property>
</object>
</property>
</object>
</interface>

View File

@ -26,6 +26,7 @@
#include "sysprof-cpu-section.h"
#include "sysprof-energy-section.h"
#include "sysprof-files-section.h"
#include "sysprof-graphics-section.h"
#include "sysprof-greeter.h"
#include "sysprof-logs-section.h"
#include "sysprof-marks-section.h"
@ -416,6 +417,7 @@ sysprof_window_class_init (SysprofWindowClass *klass)
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_GRAPHICS_SECTION);
g_type_ensure (SYSPROF_TYPE_LOGS_SECTION);
g_type_ensure (SYSPROF_TYPE_MARKS_SECTION);
g_type_ensure (SYSPROF_TYPE_MEMORY_SECTION);

View File

@ -226,6 +226,16 @@
</binding>
</object>
</child>
<child>
<object class="SysprofGraphicsSection">
<property name="title" translatable="yes">Graphics</property>
<property name="category">counters</property>
<property name="icon-name">graphics-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

@ -6,6 +6,7 @@
<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/graphics-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>
@ -23,6 +24,8 @@
<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-graphics-section.ui</file>
<file preprocess="xml-stripblanks">sysprof-graphics-section-counter.ui</file>
<file preprocess="xml-stripblanks">sysprof-greeter.ui</file>
<file preprocess="xml-stripblanks">sysprof-logs-section.ui</file>
<file preprocess="xml-stripblanks">sysprof-mark-chart-row.ui</file>