diff options
| -rw-r--r-- | CHANGE-LOG | 1 | ||||
| -rwxr-xr-x | phoronix-test-suite | 4 | ||||
| -rw-r--r-- | pts-core/functions/pts-functions_monitor.php | 4 | ||||
| -rw-r--r-- | pts-core/pts-run-cmd.php | 8 |
4 files changed, 17 insertions, 0 deletions
@@ -39,6 +39,7 @@ Phoronix Test Suite - Add battery.power option to MONITOR= for reporting battery discharge rate (as reported through ACPI) during tests - Add cpu.voltage, v3.voltage, v5.voltage, and v12.voltage options to MONITOR= for reporting line voltages on the CPU and other voltage rails through LM_Sensors - Add ToggleScreensaver option to user-config.xml and implement new screensaver toggling mechanism +- Add monitoring-options argument for more information about system monitoring feature - Other bug fixes Phoronix Test Suite 0.4.0 diff --git a/phoronix-test-suite b/phoronix-test-suite index 6af6bc4..a130d52 100755 --- a/phoronix-test-suite +++ b/phoronix-test-suite @@ -90,6 +90,9 @@ case "$1" in "system-info" | "system-information") $PHP_BIN pts-core/pts-run-cmd.php SYS_INFO ;; +"monitoring" | "monitoring-options") + $PHP_BIN pts-core/pts-run-cmd.php MONITORING_OPTIONS + ;; "diagnostics") $PHP_BIN pts-core/pts-run-cmd.php DIAGNOSTICS_DUMP ;; @@ -123,6 +126,7 @@ case "$1" in echo "suite-info: Show tests in a suite and other information about the suite" echo "test-info: Show information about a test" echo "system-info: Dump detected software and hardware information detected by PTS" + echo "monitoring-options: Show system sensors that can be monitored through PTS" echo "upload <Saved File>: Upload these results to be shared globally" echo "show-result <Saved File>: Show this result file in your web browser" echo "version: Report the Phoronix Test Suite version and code-name" diff --git a/pts-core/functions/pts-functions_monitor.php b/pts-core/functions/pts-functions_monitor.php index ab4d73a..fdc9cd3 100644 --- a/pts-core/functions/pts-functions_monitor.php +++ b/pts-core/functions/pts-functions_monitor.php @@ -19,6 +19,10 @@ function pts_monitor_update() if(defined("MONITOR_V12_VOLTAGE")) pts_record_v12_voltage(); } +function pts_monitor_arguments() +{ + return array("all", "all.temp", "all.power", "all.voltage", "gpu.temp", "cpu.temp", "sys.temp", "battery.power", "cpu.voltage", "v3.voltage", "v5.voltage", "v12.voltage"); +} function pts_monitor_statistics() { if(defined("PTS_EXIT")) diff --git a/pts-core/pts-run-cmd.php b/pts-core/pts-run-cmd.php index 022efd0..9f84135 100644 --- a/pts-core/pts-run-cmd.php +++ b/pts-core/pts-run-cmd.php @@ -309,6 +309,14 @@ switch($COMMAND) else echo "\nPTS Global Account Not Found.\n"; break; + case "MONITORING_OPTIONS": + echo "\nThe Phoronix Test Suite supports monitoring various system hardware sensors through the LM_Sensors and ACPI interfaces. The Phoronix Test Suite will automatically monitor the selected sensors while each test is running and at the end will then provide the low and high thresholds for each sensor as well as the average. In addition, the sensor results are then plotted on line graphs and can be viewed through the PTS Results Viewer.\n"; + echo "\nMonitoring these sensors are as easy as running your normal Phoronix Test Suite commands but at the beginning of the command add: MONITOR=<selected sensors> (example: MONITOR=cpu.temp,cpu.voltage phoronix-test-suite benchmark universe). Below are all of the sensors supported by this version of the Phoronix Test Suite.\n\n"; + echo "Supported Options:\n"; + foreach(pts_monitor_arguments() as $arg) + echo " - " . $arg . "\n"; + echo "\n"; + break; case "VERSION": echo "\nPhoronix Test Suite v" . PTS_VERSION . " (" . PTS_CODENAME . ")\n\n"; break; |