Skip to content

fix: remove redundant cache load and avoid GSettings lookup on every tick #534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
glazari1 wants to merge 1 commit into
base: graph-history
Choose a base branch
from
Open

fix: remove redundant cache load and avoid GSettings lookup on every tick #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 38 additions & 37 deletions extension.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ var VitalsMenuButton = GObject.registerClass({
this._historyCachePath = GLib.get_user_cache_dir() + '/vitals/history.json';
this._timeSeriesLoaded = false;

if (this._settings.get_boolean('show-sensor-history-graph'))
this._values.loadTimeSeries(this._historyCachePath);

this._menuLayout = new St.BoxLayout({
vertical: false,
clip_to_allocation: true,
Expand All @@ -95,8 +92,12 @@ var VitalsMenuButton = GObject.registerClass({
if (!this._settings.get_boolean('show-sensor-history-graph')) {
this._hideHistoryPopout();
this._values.clearTimeSeries(this._historyCachePath);
this._values._recordTimeSeries = false;
this._timeSeriesLoaded = false;
} else {
this._values.loadTimeSeries(this._historyCachePath);
this._values._recordTimeSeries = true;
this._timeSeriesLoaded = true;
}
});

Expand Down Expand Up @@ -319,42 +320,40 @@ var VitalsMenuButton = GObject.registerClass({
}
}

_showHistoryPopout(key, label, itemActor) {
if (!this._settings.get_boolean('show-sensor-history-graph')) return;
// lazy-load persisted time series on first popout open, merging with in-memory data
if (!this._timeSeriesLoaded) {
// save current in-memory data before loading cache
const memSeries = {};
const memFormat = {};
for (const k in this._values._timeSeries)
memSeries[k] = this._values._timeSeries[k].slice();
for (const k in this._values._timeSeriesFormat)
memFormat[k] = this._values._timeSeriesFormat[k];

this._values.loadTimeSeries(this._historyCachePath);

// merge: use cache as prefix, append newer in-memory entries
for (const k in memSeries) {
if (!(k in this._values._timeSeries)) {
this._values._timeSeries[k] = memSeries[k];
} else {
const cached = this._values._timeSeries[k];
const mem = memSeries[k];
const lastCacheT = cached.length > 0 ? cached[cached.length - 1].t : 0;
// append in-memory points newer than last cache entry
for (let i = 0; i < mem.length; i++) {
if (mem[i].t > lastCacheT)
cached.push(mem[i]);
}
this._values._timeSeries[k] = cached;
_ensureTimeSeriesLoaded() {
if (this._timeSeriesLoaded) return;
const memSeries = {};
const memFormat = {};
for (const k in this._values._timeSeries)
memSeries[k] = this._values._timeSeries[k].slice();
for (const k in this._values._timeSeriesFormat)
memFormat[k] = this._values._timeSeriesFormat[k];

this._values.loadTimeSeries(this._historyCachePath);

for (const k in memSeries) {
if (!(k in this._values._timeSeries)) {
this._values._timeSeries[k] = memSeries[k];
} else {
const cached = this._values._timeSeries[k];
const mem = memSeries[k];
const lastCacheT = cached.length > 0 ? cached[cached.length - 1].t : 0;
for (let i = 0; i < mem.length; i++) {
if (mem[i].t > lastCacheT)
cached.push(mem[i]);
}
// preserve format from in-memory if available
if (k in memFormat)
this._values._timeSeriesFormat[k] = memFormat[k];
this._values._timeSeries[k] = cached;
}

this._timeSeriesLoaded = true;
if (k in memFormat)
this._values._timeSeriesFormat[k] = memFormat[k];
}

this._timeSeriesLoaded = true;
}

_showHistoryPopout(key, label, itemActor) {
if (!this._settings.get_boolean('show-sensor-history-graph')) return;
this._ensureTimeSeriesLoaded();
const samples = this._values.getTimeSeries(key);
if (samples.length === 0) return;
this._historyPopoutSensorKey = key;
Expand Down Expand Up @@ -921,8 +920,10 @@ var VitalsMenuButton = GObject.registerClass({
this._historyPopout = null;
}
this._destroyTimer();
if (this._settings.get_boolean('show-sensor-history-graph'))
if (this._settings.get_boolean('show-sensor-history-graph')) {
this._ensureTimeSeriesLoaded();
this._values.saveTimeSeries(this._historyCachePath);
}
this._sensors.destroy();

for (let signal of Object.values(this._settingChangedSignals))
Expand Down
3 changes: 2 additions & 1 deletion values.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export const Values = GObject.registerClass({
_init(settings, sensorIcons) {
this._settings = settings;
this._sensorIcons = sensorIcons;
this._recordTimeSeries = settings.get_boolean('show-sensor-history-graph');

this._networkSpeedOffset = {};
this._networkSpeeds = {};
Expand All @@ -62,7 +63,7 @@ export const Values = GObject.registerClass({
}

_pushTimePoint(key, value, format) {
if (!this._settings.get_boolean('show-sensor-history-graph')) return;
if (!this._recordTimeSeries) return;
if (!this._graphableFormats.includes(format)) return;
const num = typeof value === 'number' ? value : parseFloat(value);
if (num !== num) return; // NaN check
Expand Down