153 lines
6.1 KiB
Plaintext
153 lines
6.1 KiB
Plaintext
$OpenBSD: patch-src_Plugins_Monitors_hs,v 1.1 2011/06/13 21:23:04 kili Exp $
|
|
--- src/Plugins/Monitors.hs.orig Mon May 2 19:50:32 2011
|
|
+++ src/Plugins/Monitors.hs Mon May 2 19:55:06 2011
|
|
@@ -21,19 +21,19 @@ 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.MultiCpu
|
|
+--import Plugins.Monitors.Net
|
|
+--import Plugins.Monitors.Mem
|
|
+--import Plugins.Monitors.Swap
|
|
+--import Plugins.Monitors.Cpu
|
|
+--import Plugins.Monitors.MultiCpu
|
|
import Plugins.Monitors.Batt
|
|
-import Plugins.Monitors.Thermal
|
|
-import Plugins.Monitors.ThermalZone
|
|
-import Plugins.Monitors.CpuFreq
|
|
-import Plugins.Monitors.CoreTemp
|
|
-import Plugins.Monitors.Disk
|
|
-import Plugins.Monitors.Top
|
|
-import Plugins.Monitors.Uptime
|
|
+--import Plugins.Monitors.Thermal
|
|
+--import Plugins.Monitors.ThermalZone
|
|
+--import Plugins.Monitors.CpuFreq
|
|
+--import Plugins.Monitors.CoreTemp
|
|
+--import Plugins.Monitors.Disk
|
|
+--import Plugins.Monitors.Top
|
|
+--import Plugins.Monitors.Uptime
|
|
#ifdef IWLIB
|
|
import Plugins.Monitors.Wireless
|
|
#endif
|
|
@@ -45,22 +45,22 @@ import Plugins.Monitors.Volume
|
|
#endif
|
|
|
|
data Monitors = Weather Station Args Rate
|
|
- | Network Interface Args Rate
|
|
- | BatteryP [String] Args Rate
|
|
- | DiskU DiskSpec Args Rate
|
|
- | DiskIO DiskSpec Args Rate
|
|
- | Thermal Zone Args Rate
|
|
- | ThermalZone ZoneNo Args Rate
|
|
- | Memory Args Rate
|
|
- | Swap Args Rate
|
|
- | Cpu Args Rate
|
|
- | MultiCpu Args Rate
|
|
+-- | Network Interface Args Rate
|
|
+-- | BatteryP [String] Args Rate
|
|
+-- | DiskU DiskSpec Args Rate
|
|
+-- | DiskIO DiskSpec Args Rate
|
|
+-- | Thermal Zone Args Rate
|
|
+-- | ThermalZone ZoneNo Args Rate
|
|
+-- | Memory Args Rate
|
|
+-- | Swap Args Rate
|
|
+-- | Cpu Args Rate
|
|
+-- | MultiCpu Args Rate
|
|
| Battery Args Rate
|
|
- | CpuFreq Args Rate
|
|
- | CoreTemp Args Rate
|
|
- | TopProc Args Rate
|
|
- | TopMem Args Rate
|
|
- | Uptime Args Rate
|
|
+-- | CpuFreq Args Rate
|
|
+-- | CoreTemp Args Rate
|
|
+-- | TopProc Args Rate
|
|
+-- | TopMem Args Rate
|
|
+-- | Uptime Args Rate
|
|
#ifdef IWLIB
|
|
| Wireless Interface Args Rate
|
|
#endif
|
|
@@ -84,22 +84,22 @@ type DiskSpec = [(String, String)]
|
|
|
|
instance Exec Monitors where
|
|
alias (Weather s _ _) = s
|
|
- alias (Network i _ _) = i
|
|
- alias (Thermal z _ _) = z
|
|
- alias (ThermalZone z _ _) = "thermal" ++ show z
|
|
- alias (Memory _ _) = "memory"
|
|
- alias (Swap _ _) = "swap"
|
|
- alias (Cpu _ _) = "cpu"
|
|
- alias (MultiCpu _ _) = "multicpu"
|
|
+-- alias (Network i _ _) = i
|
|
+-- alias (Thermal z _ _) = z
|
|
+-- alias (ThermalZone z _ _) = "thermal" ++ show z
|
|
+-- alias (Memory _ _) = "memory"
|
|
+-- alias (Swap _ _) = "swap"
|
|
+-- alias (Cpu _ _) = "cpu"
|
|
+-- alias (MultiCpu _ _) = "multicpu"
|
|
alias (Battery _ _) = "battery"
|
|
- alias (BatteryP _ _ _)= "battery"
|
|
- alias (CpuFreq _ _) = "cpufreq"
|
|
- alias (TopProc _ _) = "top"
|
|
- alias (TopMem _ _) = "topmem"
|
|
- alias (CoreTemp _ _) = "coretemp"
|
|
- alias (DiskU _ _ _) = "disku"
|
|
- alias (DiskIO _ _ _) = "diskio"
|
|
- alias (Uptime _ _) = "uptime"
|
|
+-- alias (BatteryP _ _ _)= "battery"
|
|
+-- alias (CpuFreq _ _) = "cpufreq"
|
|
+-- alias (TopProc _ _) = "top"
|
|
+-- alias (TopMem _ _) = "topmem"
|
|
+-- alias (CoreTemp _ _) = "coretemp"
|
|
+-- alias (DiskU _ _ _) = "disku"
|
|
+-- alias (DiskIO _ _ _) = "diskio"
|
|
+-- alias (Uptime _ _) = "uptime"
|
|
#ifdef IWLIB
|
|
alias (Wireless i _ _) = i ++ "wi"
|
|
#endif
|
|
@@ -109,24 +109,24 @@ instance Exec Monitors where
|
|
#ifdef ALSA
|
|
alias (Volume m c _ _) = m ++ ":" ++ c
|
|
#endif
|
|
- start (Network i a r) = startNet i a r
|
|
- start (Cpu a r) = startCpu a r
|
|
- start (MultiCpu a r) = startMultiCpu a r
|
|
- start (TopProc a r) = startTop a r
|
|
- start (TopMem a r) = runM a topMemConfig runTopMem r
|
|
+-- start (Network i a r) = startNet i a r
|
|
+-- start (Cpu a r) = startCpu a r
|
|
+-- start (MultiCpu a r) = startMultiCpu a r
|
|
+-- start (TopProc a r) = startTop a r
|
|
+-- start (TopMem a r) = runM a topMemConfig runTopMem r
|
|
start (Weather s a r) = runM (a ++ [s]) weatherConfig runWeather r
|
|
- start (Thermal z a r) = runM (a ++ [z]) thermalConfig runThermal r
|
|
- start (ThermalZone z a r) =
|
|
- runM (a ++ [show z]) thermalZoneConfig runThermalZone r
|
|
- start (Memory a r) = runM a memConfig runMem r
|
|
- start (Swap a r) = runM a swapConfig runSwap r
|
|
+-- start (Thermal z a r) = runM (a ++ [z]) thermalConfig runThermal r
|
|
+-- start (ThermalZone z a r) =
|
|
+-- runM (a ++ [show z]) thermalZoneConfig runThermalZone r
|
|
+-- start (Memory a r) = runM a memConfig runMem r
|
|
+-- start (Swap a r) = runM a swapConfig runSwap 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) = startDiskIO s a r
|
|
- start (Uptime a r) = runM a uptimeConfig runUptime 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) = startDiskIO s a r
|
|
+-- start (Uptime a r) = runM a uptimeConfig runUptime r
|
|
#ifdef IWLIB
|
|
start (Wireless i a r) = runM (a ++ [i]) wirelessConfig runWireless r
|
|
#endif
|