Skip to content
Closed
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
292 changes: 203 additions & 89 deletions Cargo.lock

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ heim = { git = "https://github.com/bvaisvil/heim.git", branch = "zenith_changes"
futures = "0.3.31"
gumdrop = { version = "~0.8.1", features = ["default_expr"] }
chrono = "~0.4.39"
sysinfo = { git = "https://github.com/bvaisvil/sysinfo.git", branch = "zenith_changes_15.1_mem_fix" }
sysinfo = "0.37"
dirs-next = "2.0.0"
serde = { version = "~1.0.217", features = ["derive"] }
serde_derive = "~1.0.217"
Expand All @@ -44,3 +44,4 @@ nvml-wrapper = { version = "0.10.0", optional = true }
unicode-width = "0.2.0"
[target.'cfg(target_os = "linux")'.dependencies]
linux-taskstats = { version = "0.7.0", default-features = false }
procfs = "0.17"
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/**
* Copyright 2019-2020, Benjamin Vaisvil and the zenith contributors
*/

#[macro_use]
extern crate num_derive;
#[macro_use]
Expand Down Expand Up @@ -160,6 +159,7 @@ fn create_geometry(
geometry
}

#[allow(clippy::too_many_arguments)]
fn start_zenith(
rate: u64,
cpu_height: u16,
Expand Down
12 changes: 6 additions & 6 deletions src/metrics/disk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use std::fs::{canonicalize, read_link};
use std::ops;
use std::path::PathBuf;
use std::time::Duration;
use sysinfo::{Disk, DiskExt};
use sysinfo::Disk;

#[derive(PartialEq, Copy, Clone, Debug)]
pub struct IoMetrics {
Expand Down Expand Up @@ -81,11 +81,11 @@ impl ZDisk {

pub fn from_disk(d: &Disk) -> ZDisk {
ZDisk {
mount_point: d.get_mount_point().to_path_buf(),
available_bytes: d.get_available_space(),
size_bytes: d.get_total_space(),
name: get_device_name(d.get_name()),
file_system: String::from_utf8_lossy(d.get_file_system()).into_owned(),
mount_point: d.mount_point().to_path_buf(),
available_bytes: d.available_space(),
size_bytes: d.total_space(),
name: get_device_name(d.name()),
file_system: d.file_system().to_string_lossy().into_owned(),
previous_io: IoMetrics {
read_bytes: 0,
write_bytes: 0,
Expand Down
1 change: 0 additions & 1 deletion src/metrics/graphics/device.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/**
* Copyright 2019-2020, Benjamin Vaisvil and the zenith contributors
*/

pub trait GraphicsExt {
fn update_gfx_devices(&mut self);
#[allow(dead_code)]
Expand Down
Loading
Loading