Skip to content

Fixes on detection diskuser_per and memused #17

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
jsanroman wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes on detection diskuser_per and memused #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3aa61a
Improve detection to diskused_per
jsanroman Dec 11, 2015
ccb2812
Improved parse /proc/meminfo based on name property instead of position
jsanroman Dec 11, 2015
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
17 changes: 12 additions & 5 deletions lib/usagewatch/linux.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ def self.uw_diskused
# Show the percentage of disk used.
def self.uw_diskused_perc
df = `df --total`
df.split(" ").last.to_f.round(2)

df.split(" ").reverse.each do |l|
return l.to_f.round(2) if l.include?("%")
end
end

# Show the percentage of CPU used
Expand Down Expand Up @@ -110,10 +113,14 @@ def self.uw_memused
end
end

@memstat = @result.split("\n").collect{|x| x.strip}
@memtotal = @memstat[0].gsub(/[^0-9]/, "")
@memactive = @memstat[5].gsub(/[^0-9]/, "")
@memactivecalc = (@memactive.to_f * 100) / @memtotal.to_f
memhash = Hash.new
@result.each_line do |l|
key, val = l.split(':')
if val.include?('kB') then val = val.gsub(/\s+kB/, ''); end
memhash["#{key}"] = val.strip
end

@memactivecalc = (memhash["Active"].to_f * 100) / memhash["MemTotal"].to_f
@memusagepercentage = @memactivecalc.round
end

Expand Down