summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-11-19 10:13:04 -0500
committerMichael Larabel <michael@phx-laptop.(none)>2008-11-19 10:13:04 -0500
commit26fdc1f0dda56177b83a0f84fb8ce2682fa36300 (patch)
tree082a5d0ee40b2acc680045df01c1b19fe2c39609
parent7a91e3ac520b95fa4bcfb432565c856e0ea97aac (diff)
downloadphoronix-test-suite-upstream-26fdc1f0dda56177b83a0f84fb8ce2682fa36300.tar.gz
phoronix-test-suite-upstream-26fdc1f0dda56177b83a0f84fb8ce2682fa36300.tar.xz
phoronix-test-suite-upstream-26fdc1f0dda56177b83a0f84fb8ce2682fa36300.zip
system_monitor: Update it to work with new APIs
-rw-r--r--TYDAL-CHANGE-LOG1
-rw-r--r--pts-core/modules/system_monitor.php6
2 files changed, 4 insertions, 3 deletions
diff --git a/TYDAL-CHANGE-LOG b/TYDAL-CHANGE-LOG
index 7ecbd27..4851fe2 100644
--- a/TYDAL-CHANGE-LOG
+++ b/TYDAL-CHANGE-LOG
@@ -36,3 +36,4 @@ Phoronix Test Suite (Git)
- pts-core: Standardize all pts-core official functions with pts_, sw_, hw_, or read_ prefix
- pts-core: Fix graphics constant warnings generated in pts_extended_init()
- tandem_XmlReader: Switch caching from using a GLOBALS variable to using a static variable within the XML reading class
+- system_monitor: Update it to work with new APIs
diff --git a/pts-core/modules/system_monitor.php b/pts-core/modules/system_monitor.php
index 2a23509..020af06 100644
--- a/pts-core/modules/system_monitor.php
+++ b/pts-core/modules/system_monitor.php
@@ -46,7 +46,7 @@ class system_monitor extends pts_module_interface
// General Functions
//
- public static function __startup($obj = NULL)
+ public static function __pre_option_process($obj = NULL)
{
$to_show = getenv("MONITOR");
@@ -142,9 +142,9 @@ class system_monitor extends pts_module_interface
}
public static function __pre_run_process()
{
- pts_module::pts_timed_function(15, "pts_monitor_update");
+ pts_module::pts_timed_function(10, "pts_monitor_update");
}
- public static function __shutdown($obj = NULL)
+ public static function __post_option_process($obj = NULL)
{
if(defined("PTS_EXIT"))
return;