Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion extension.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ var VitalsMenuButton = GObject.registerClass({
'network' : { 'icon': 'network-symbolic.svg',
'icon-rx': 'network-download-symbolic.svg',
'icon-tx': 'network-upload-symbolic.svg',
'icon-ping': 'network-ping-symbolic.svg',
'icon-ad': '../flags/1x1/ad.svg',
'icon-ae': '../flags/1x1/ae.svg',
'icon-af': '../flags/1x1/af.svg',
Expand Down Expand Up @@ -337,7 +338,8 @@ var VitalsMenuButton = GObject.registerClass({
'fixed-widths', 'hide-icons', 'unit',
'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
'network-public-ip-show-flag', 'network-speed-format', 'storage-measurement',
'include-static-info', 'include-static-gpu-info' ];
'include-static-info', 'include-static-gpu-info',
'network-ping-host' ];

for (let setting of Object.values(settings))
this._addSettingChangedSignal(setting, this._redrawMenu.bind(this));
Expand Down
8 changes: 8 additions & 0 deletions icons/gnome/network-ping-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/original/network-ping-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions prefs.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,24 @@ const Settings = new GObject.Class({
this._settings.bind('network-public-ip-interval', this.builder.get_object('network-public-ip-interval'),
'value', Gio.SettingsBindFlags.DEFAULT);

let pingHostEntry = this.builder.get_object('network-ping-host');
let pingHostSave = this.builder.get_object('network-ping-host-save');
let getSavedPingHost = () => this._settings.get_string('network-ping-host');
let savePingHost = () => {
if (pingHostEntry.get_text() === getSavedPingHost())
return;

this._settings.set_string('network-ping-host', pingHostEntry.get_text());
pingHostSave.set_sensitive(false);
};

pingHostEntry.set_text(getSavedPingHost());
pingHostEntry.connect('changed', (widget) => {
pingHostSave.set_sensitive(widget.get_text() !== getSavedPingHost());
});
pingHostEntry.connect('activate', () => savePingHost());
pingHostSave.connect('clicked', () => savePingHost());

// process individual text entry sensor preferences
sensors = [ 'storage-path', 'monitor-cmd' ];
for (let key in sensors) {
Expand Down
41 changes: 41 additions & 0 deletions prefs.ui
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,47 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="hexpand">1</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">1</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Ping host</property>
</object>
</child>
<child>
<object class="GtkEntry" id="network-ping-host">
<property name="placeholder_text" translatable="no">e.g. 1.1.1.1</property>
<property name="can_focus">1</property>
<property name="editable">1</property>
<property name="width_chars">18</property>
</object>
</child>
<child>
<object class="GtkButton" id="network-ping-host-save">
<property name="can_focus">1</property>
<property name="sensitive">0</property>
<property name="tooltip_text" translatable="yes">Save ping host</property>
<property name="icon_name">object-select-symbolic</property>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</property>
</object>
Expand Down
Binary file modified schemas/gschemas.compiled
Binary file not shown.
5 changes: 5 additions & 0 deletions schemas/org.gnome.shell.extensions.vitals.gschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@
<summary>Network speed format</summary>
<description>Should speed display in bits or bytes?</description>
</key>
<key type="s" name="network-ping-host">
<default>""</default>
<summary>Ping target host</summary>
<description>Hostname or IP address to ping for latency measurement</description>
</key>
<key type="s" name="storage-path">
<default>"/"</default>
<summary>Storage path</summary>
Expand Down
63 changes: 63 additions & 0 deletions sensors.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import GLib from 'gi://GLib';
import GObject from 'gi://GObject';
import * as SubProcessModule from './helpers/subprocess.js';
import Gio from 'gi://Gio';
import * as FileModule from './helpers/file.js';
import { gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.js';
import NM from 'gi://NM';
Expand All @@ -46,6 +47,8 @@ export const Sensors = GObject.registerClass({
this._settings = settings;
this._sensorIcons = sensorIcons;

this._pingCancellable = null;

this.resetHistory();

this._last_processor = { 'core': {}, 'speed': [] };
Expand All @@ -54,6 +57,7 @@ export const Sensors = GObject.registerClass({
this._addSettingChangedSignal('show-gpu', this._reconfigureNvidiaSmiProcess.bind(this));
this._addSettingChangedSignal('update-time', this._reconfigureNvidiaSmiProcess.bind(this));
this._addSettingChangedSignal('network-public-ip-interval', () => {this._lastPublicIPCheck = 0;});
this._addSettingChangedSignal('network-ping-host', () => this._pingCancellable?.cancel());
//this._addSettingChangedSignal('include-static-gpu-info', this._reconfigureNvidiaSmiProcess.bind(this));

this._gpu_drm_vendors = null;
Expand Down Expand Up @@ -338,6 +342,63 @@ export const Sensors = GObject.registerClass({
this._returnValue(callback, 'WiFi Signal Level', signal, 'network', 'string');
}
}).catch(err => { });

this._pollPing(value => {
this._returnValue(callback, 'Ping', value, 'network-ping', 'string');
});
}

_pollPing(callback) {
let host = this._settings.get_string('network-ping-host').trim();
if (!host) return;

this._pingCancellable?.cancel();
this._pingCancellable = new Gio.Cancellable();
let cancellable = this._pingCancellable;

let subprocess;
try {
subprocess = new Gio.Subprocess({
argv: ['ping', '-c', '1', '-W', '5', host],
flags: Gio.SubprocessFlags.STDOUT_PIPE |
Gio.SubprocessFlags.STDERR_PIPE,
});
subprocess.init(null);
} catch (e) {
callback('?? ms');
return;
}

cancellable.connect(() => subprocess.force_exit());

subprocess.communicate_utf8_async(null, cancellable, (proc, result) => {
let value = this._parsePingResult(proc, result, cancellable);
callback(value);
});
}

_parsePingResult(proc, result, cancellable) {
let stdout, exitStatus;
try {
[, stdout] = proc.communicate_utf8_finish(result);
exitStatus = proc.get_exit_status();
} catch (e) {
let cancelled = cancellable.is_cancelled();
return cancelled ? this._pingTimeoutLabel() : '?? ms';
}

if (exitStatus === 0 && stdout) {
let match = /time[=<]([\d.]+)\s*ms/.exec(stdout);
if (match)
return `${parseFloat(match[1]).toFixed(1)} ms`;
}

return exitStatus === 1 ? this._pingTimeoutLabel() : '?? ms';
}

_pingTimeoutLabel() {
let timeoutMs = Math.min(Math.max(this._settings.get_int('update-time'), 1), 5) * 1000;
return `${timeoutMs}+ ms`;
}

_queryStorage(callback, dwell) {
Expand Down Expand Up @@ -1066,11 +1127,13 @@ export const Sensors = GObject.registerClass({
this._frameMonitorLastTime = 0;
this._frameMonitorFrameCount = 0;
this._frameMonitorAccTime = 0;
this._pingCancellable?.cancel();
}

destroy() {
this._destroyFrameMonitor();
this._terminateNvidiaSmiProcess();
this._pingCancellable?.cancel();

for (let signal of Object.values(this._settingChangedSignals))
this._settings.disconnect(signal);
Expand Down