Skip to content
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

Fix for disk speed problem #14

Closed
wants to merge 1 commit into from
Closed

Fix for disk speed problem #14

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
29 changes: 21 additions & 8 deletions [email protected]/extension.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1495,7 +1495,7 @@ const Disk = class SystemMonitor_Disk extends ElementBase {
this.last = [0, 0];
this.usage = [0, 0];
this.last_time = 0;
this.tip_format(_('MiB/s'));
this.tip_format(_('MB/s')); // changed from MiB to MB (space standard)
this.update();
}
update_mounts(mounts) {
Expand All @@ -1509,21 +1509,34 @@ const Disk = class SystemMonitor_Disk extends ElementBase {
let as_r = source.load_contents_finish(result);
let lines = parse_bytearray(as_r[1]).toString().split('\n');

let blocks = Gio.file_new_for_path('/sys/block');
let list = blocks.enumerate_children('standard::name', 0, null);
let disks = [];
let disk = null;
while (disk = list.next_file(null)) {
disks.push(disk.get_name());
}

for (let i = 0; i < lines.length; i++) {
let line = lines[i];
let entry = line.trim().split(/[\s]+/);
if (typeof (entry[1]) === 'undefined') {
break;
}
accum[0] += parseInt(entry[5]);
accum[1] += parseInt(entry[9]);

if (disks.indexOf(entry[2]) != -1) {
// sectors of 512 bytes: / 2048 to get MiB or
// * 512 / 1000000 to get MB
accum[0] += parseInt(entry[5]) * 512 / 1000000; // read
accum[1] += parseInt(entry[9]) * 512 / 1000000; // write
}
}

let time = GLib.get_monotonic_time() / 1000;
let delta = (time - this.last_time) / 1000;
let time = GLib.get_monotonic_time() / 1000000; // micro to seconds
let delta = time - this.last_time;
if (delta > 0) {
for (let i = 0; i < 2; i++) {
this.usage[i] = ((accum[i] - this.last[i]) / delta / 1024 / 8);
this.usage[i] = ((accum[i] - this.last[i]) / delta);
this.last[i] = accum[i];
}
}
Expand Down Expand Up @@ -2312,8 +2325,8 @@ const Gpu = class SystemMonitor_Gpu extends ElementBase {
this.vals = [0, 0];
this.tip_vals = [0, 0];
} else {
// we subtract percentage from memory because we do not want memory to be
// "accumulated" in the chart with utilization; these two measures should be
// we subtract percentage from memory because we do not want memory to be
// "accumulated" in the chart with utilization; these two measures should be
// independent
this.vals = [this.percentage, this.mem / this.total * 100 - this.percentage];
this.tip_vals = [Math.round(this.vals[0]), this.mem];
Expand Down