Code clean up
This commit is contained in:
parent
17ce090ef8
commit
eba6f977ec
@ -1,7 +1,4 @@
|
|||||||
use std::fs::File;
|
use std::fs::File;
|
||||||
// use std::path::Path;
|
|
||||||
// use std::io::prelude::*;
|
|
||||||
// use regex::Regex;
|
|
||||||
use std::io::{self, BufRead, BufReader};
|
use std::io::{self, BufRead, BufReader};
|
||||||
use std::thread;
|
use std::thread;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
@ -26,15 +23,15 @@ struct CpuTimes {
|
|||||||
impl CpuTimes {
|
impl CpuTimes {
|
||||||
pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
CpuTimes {
|
CpuTimes {
|
||||||
user: 0,
|
user: 0,
|
||||||
nice: 0,
|
nice: 0,
|
||||||
system: 0,
|
system: 0,
|
||||||
idle: 0,
|
idle: 0,
|
||||||
iowait: 0,
|
iowait: 0,
|
||||||
irq: 0,
|
irq: 0,
|
||||||
softirq: 0,
|
softirq: 0,
|
||||||
steal: 0,
|
steal: 0,
|
||||||
guest: 0,
|
guest: 0,
|
||||||
guest_nice: 0
|
guest_nice: 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -98,15 +95,15 @@ impl UnibarModuleCpu {
|
|||||||
|
|
||||||
if fields.len() >= 8 {
|
if fields.len() >= 8 {
|
||||||
return Ok(CpuTimes {
|
return Ok(CpuTimes {
|
||||||
user: fields[0],
|
user: fields[0],
|
||||||
nice: fields[1],
|
nice: fields[1],
|
||||||
system: fields[2],
|
system: fields[2],
|
||||||
idle: fields[3],
|
idle: fields[3],
|
||||||
iowait: fields[4],
|
iowait: fields[4],
|
||||||
irq: fields[5],
|
irq: fields[5],
|
||||||
softirq: fields[6],
|
softirq: fields[6],
|
||||||
steal: fields[7],
|
steal: fields[7],
|
||||||
guest: if fields.len() > 8 { fields[8] } else { 0 },
|
guest: if fields.len() > 8 { fields[8] } else { 0 },
|
||||||
guest_nice: if fields.len() > 9 { fields[9] } else { 0 },
|
guest_nice: if fields.len() > 9 { fields[9] } else { 0 },
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user