From 6c4970ea293796a832ecd1b292ec99a9695bf276 Mon Sep 17 00:00:00 2001 From: Jose A Ortega Ruiz Date: Thu, 4 Feb 2010 02:54:55 +0100 Subject: New DiskU and DiskIO monitors Ignore-this: b72a9ad54c9ae478f2c3fbdcda4d26c8 New monitors for disk usage and throughput, replacing Disk. darcs-hash:20100204015455-748be-41e03ee9dff0e3e9e3725aae8a3e07c6facb70dc.gz --- Plugins/Monitors.hs | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) (limited to 'Plugins/Monitors.hs') diff --git a/Plugins/Monitors.hs b/Plugins/Monitors.hs index 4943b69..c8d7e83 100644 --- a/Plugins/Monitors.hs +++ b/Plugins/Monitors.hs @@ -37,7 +37,8 @@ data Monitors = Weather Station Args Rate | MultiCpu Args Rate | Battery Args Rate | BatteryP [String] Args Rate - | Disk DiskSpec Args Rate + | DiskU DiskSpec Args Rate + | DiskIO DiskSpec Args Rate | Thermal Zone Args Rate | CpuFreq Args Rate | CoreTemp Args Rate @@ -64,16 +65,18 @@ instance Exec Monitors where alias (BatteryP _ _ _)= "battery" alias (CpuFreq _ _) = "cpufreq" alias (CoreTemp _ _) = "coretemp" - alias (Disk _ _ _) = "disk" - start (Weather s a r) = runM (a ++ [s]) weatherConfig runWeather r - start (Network i a r) = runM (a ++ [i]) netConfig runNet r - start (Thermal z a r) = runM (a ++ [z]) thermalConfig runThermal r - start (Memory a r) = runM a memConfig runMem r - start (Swap a r) = runM a swapConfig runSwap r - start (Cpu a r) = runM a cpuConfig runCpu r - start (MultiCpu a r) = runM a multiCpuConfig runMultiCpu r - start (Battery a r) = runM a battConfig runBatt r - start (BatteryP s a r) = runM a battConfig (runBatt' s) r - start (CpuFreq a r) = runM a cpuFreqConfig runCpuFreq r - start (CoreTemp a r) = runM a coreTempConfig runCoreTemp r - start (Disk s a r) = runM a diskConfig (runDisk s) r + alias (DiskU _ _ _) = "disku" + alias (DiskIO _ _ _) = "diskio" + start (Weather s a r) = runM (a ++ [s]) weatherConfig runWeather r + start (Network i a r) = runM (a ++ [i]) netConfig runNet r + start (Thermal z a r) = runM (a ++ [z]) thermalConfig runThermal r + start (Memory a r) = runM a memConfig runMem r + start (Swap a r) = runM a swapConfig runSwap r + start (Cpu a r) = runM a cpuConfig runCpu r + start (MultiCpu a r) = runM a multiCpuConfig runMultiCpu r + start (Battery a r) = runM a battConfig runBatt r + start (BatteryP s a r) = runM a battConfig (runBatt' s) r + start (CpuFreq a r) = runM a cpuFreqConfig runCpuFreq r + start (CoreTemp a r) = runM a coreTempConfig runCoreTemp r + start (DiskU s a r) = runM a diskUConfig (runDiskU s) r + start (DiskIO s a r) = runM a diskIOConfig (runDiskIO s) r -- cgit v1.2.3