summaryrefslogtreecommitdiffstats
path: root/pts-core/modules
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-11-17 14:38:52 -0500
committerMichael Larabel <michael@phx-laptop.(none)>2008-11-17 14:38:52 -0500
commit5fc0dfda5f28d34d276af5659618f6248a401277 (patch)
tree0aa9660460f93497f97ce8cc7356eca68541bb2d /pts-core/modules
parenta3e4b31b492c593cbf063e3d6ba2ebe63b3bdb5b (diff)
downloadphoronix-test-suite-upstream-5fc0dfda5f28d34d276af5659618f6248a401277.tar.gz
phoronix-test-suite-upstream-5fc0dfda5f28d34d276af5659618f6248a401277.tar.xz
phoronix-test-suite-upstream-5fc0dfda5f28d34d276af5659618f6248a401277.zip
pts-core: Standardize CPU function names
Diffstat (limited to 'pts-core/modules')
-rw-r--r--pts-core/modules/system_monitor.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/pts-core/modules/system_monitor.php b/pts-core/modules/system_monitor.php
index 236fe34..8b893df 100644
--- a/pts-core/modules/system_monitor.php
+++ b/pts-core/modules/system_monitor.php
@@ -24,7 +24,7 @@
class system_monitor extends pts_module_interface
{
const module_name = "System Monitor";
- const module_version = "1.2.2";
+ const module_version = "1.3.0";
const module_description = "This module contains sensor monitoring support.";
const module_author = "Michael Larabel";
@@ -502,7 +502,7 @@ class system_monitor extends pts_module_interface
}
if(pts_is_assignment("MONITOR_CPU_TEMP"))
{
- $temp = processor_temperature();
+ $temp = hw_cpu_temperature();
if($temp != -1)
pts_module::save_file(".s/CPU_TEMPERATURE", $temp, true);
@@ -565,7 +565,7 @@ class system_monitor extends pts_module_interface
}
if(pts_is_assignment("MONITOR_CPU_FREQ"))
{
- $speed = current_processor_frequency();
+ $speed = hw_cpu_current_frequency();
if($speed > 0)
pts_module::save_file(".s/CPU_FREQ", $speed, true);
@@ -586,7 +586,7 @@ class system_monitor extends pts_module_interface
}
if(pts_is_assignment("MONITOR_CPU_USAGE"))
{
- $usage = current_processor_usage();
+ $usage = hw_cpu_usage();
if($usage != -1)
pts_module::save_file(".s/CPU_USAGE", $usage, true);