From d7c62ed01b25fb001dec0f9b472273be55b00363 Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Mon, 18 Jan 2010 02:06:39 +0100 Subject: Small refactoring Ignore-this: 886cfda3510443d12f90c6184bf7f6e6 darcs-hash:20100118010639-40885-c69f6371d0ac730d14859f78f4b091e9327e551d.gz --- Plugins/Monitors/MultiCpu.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Plugins/Monitors/MultiCpu.hs b/Plugins/Monitors/MultiCpu.hs index a77ba71..c0fa21a 100644 --- a/Plugins/Monitors/MultiCpu.hs +++ b/Plugins/Monitors/MultiCpu.hs @@ -30,11 +30,11 @@ cpuData = do s <- B.readFile "/proc/stat" return $ cpuParser s cpuParser :: B.ByteString -> [[Float]] -cpuParser = map (map read . tail) . lns - where lns = takeWhile isCpu . map unpW . B.lines - isCpu (w:_) = "cpu" `isPrefixOf` w +cpuParser = map parseList . cpuLists + where cpuLists = takeWhile isCpu . map B.words . B.lines + isCpu (w:_) = "cpu" `isPrefixOf` (B.unpack w) isCpu _ = False - unpW = map B.unpack . B.words + parseList = map (read . B.unpack) . tail parseCpuData :: IO [[Float]] parseCpuData = -- cgit v1.2.3