From 636c6edc8a6d799846aece65744643e4adb0e82c Mon Sep 17 00:00:00 2001 From: jao Date: Fri, 26 Dec 2014 18:20:49 +0100 Subject: Honour the -S (show suffix) monitor flag in CpuFreq --- src/Plugins/Monitors/CpuFreq.hs | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/Plugins/Monitors/CpuFreq.hs b/src/Plugins/Monitors/CpuFreq.hs index d3ecf89..8301547 100644 --- a/src/Plugins/Monitors/CpuFreq.hs +++ b/src/Plugins/Monitors/CpuFreq.hs @@ -18,22 +18,24 @@ import Plugins.Monitors.Common import Plugins.Monitors.CoreCommon -- | --- Cpu frequency default configuration. Default template contains only one --- core frequency, user should specify custom template in order to get more --- cpu frequencies. +-- Cpu frequency default configuration. Default template contains only +-- one core frequency, user should specify custom template in order to +-- get more cpu frequencies. cpuFreqConfig :: IO MConfig -cpuFreqConfig = mkMConfig - "Freq: " -- template - (map ((++) "cpu" . show) [0 :: Int ..]) -- available - -- replacements +cpuFreqConfig = + mkMConfig "Freq: " (map ((++) "cpu" . show) [0 :: Int ..]) + -- | --- Function retrieves monitor string holding the cpu frequency (or frequencies) +-- Function retrieves monitor string holding the cpu frequency (or +-- frequencies) runCpuFreq :: [String] -> Monitor String runCpuFreq _ = do + suffix <- getConfigValue useSuffix let path = ["/sys/devices/system/cpu/cpu", "/cpufreq/scaling_cur_freq"] divisor = 1e6 :: Double - fmt x | x < 1 = show (round (x * 1000) :: Integer) ++ "MHz" - | otherwise = show x ++ "GHz" + fmt x | x < 1 = show (round (x * 1000) :: Integer) ++ + if suffix then "MHz" else "" + | otherwise = show x ++ if suffix then "GHz" else "" failureMessage <- getConfigValue naString checkedDataRetrieval failureMessage [path] Nothing (/divisor) fmt -- cgit v1.2.3