$OpenBSD: patch-Plugins_Monitors_hs,v 1.1.1.1 2010/05/10 08:07:06 dcoppa Exp $ --- Plugins/Monitors.hs.orig Wed Apr 28 23:59:48 2010 +++ Plugins/Monitors.hs Thu Apr 29 00:00:33 2010 @@ -18,25 +18,25 @@ import Plugins import Plugins.Monitors.Common ( runM ) import Plugins.Monitors.Weather -import Plugins.Monitors.Net -import Plugins.Monitors.Mem -import Plugins.Monitors.Swap -import Plugins.Monitors.Cpu -import Plugins.Monitors.Batt -import Plugins.Monitors.Thermal -import Plugins.Monitors.CpuFreq -import Plugins.Monitors.CoreTemp +--import Plugins.Monitors.Net +--import Plugins.Monitors.Mem +--import Plugins.Monitors.Swap +--import Plugins.Monitors.Cpu +--import Plugins.Monitors.Batt +--import Plugins.Monitors.Thermal +--import Plugins.Monitors.CpuFreq +--import Plugins.Monitors.CoreTemp data Monitors = Weather Station Args Rate - | Network Interface Args Rate - | Memory Args Rate - | Swap Args Rate - | Cpu Args Rate - | Battery Args Rate - | BatteryP [String] Args Rate - | Thermal Zone Args Rate - | CpuFreq Args Rate - | CoreTemp Args Rate +-- | Network Interface Args Rate +-- | Memory Args Rate +-- | Swap Args Rate +-- | Cpu Args Rate +-- | Battery Args Rate +-- | BatteryP [String] Args Rate +-- | Thermal Zone Args Rate +-- | CpuFreq Args Rate +-- | CoreTemp Args Rate deriving (Show,Read,Eq) type Args = [String] @@ -49,22 +49,22 @@ type Rate = Int instance Exec Monitors where alias (Weather s _ _) = s - alias (Network i _ _) = i - alias (Thermal z _ _) = z - alias (Memory _ _) = "memory" - alias (Swap _ _) = "swap" - alias (Cpu _ _) = "cpu" - alias (Battery _ _) = "battery" - alias (BatteryP _ _ _)= "battery" - alias (CpuFreq _ _) = "cpufreq" - alias (CoreTemp _ _) = "coretemp" +-- alias (Network i _ _) = i +-- alias (Thermal z _ _) = z +-- alias (Memory _ _) = "memory" +-- alias (Swap _ _) = "swap" +-- alias (Cpu _ _) = "cpu" +-- alias (Battery _ _) = "battery" +-- alias (BatteryP _ _ _)= "battery" +-- alias (CpuFreq _ _) = "cpufreq" +-- alias (CoreTemp _ _) = "coretemp" 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 (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 (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 (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