josh/phoronix-test-suite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pts-core: Few fixes

Browse Source
This commit is contained in:
Michael Larabel
2024-12-01 05:16:24 -06:00
parent 8c171bb197
commit d68dcb9b8d
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pts-core/objects/phodevi/components/phodevi_system.php
View File

@@ -330,7 +330,7 @@ class phodevi_system extends phodevi_device_interface
}
break;
default:
if(substr($fs, 0, 9) == 'UNKNOWN (')
if(!empty($fs) && substr($fs, 0, 9) == 'UNKNOWN (')
{
$magic_block = substr($fs, 9, -1);
$known_magic_blocks = array(

2
pts-core/objects/phodevi/sensors/memory_temp.php
View File

@@ -33,7 +33,7 @@ class memory_temp extends phodevi_sensor
if(pts_client::executable_in_path('ipmitool'))
{
$ipmi = phodevi_linux_parser::read_ipmitool_sensor(array('DIMM_MOSFET_1', 'DIMM_MOSFET_2', 'DDR4_A1_Temp'));
$ipmi = phodevi_linux_parser::read_ipmitool_sensor(array('DIMM_MOSFET_1', 'DIMM_MOSFET_2', 'DDR4_A1_Temp', 'DIMMA~F Temp'));
if($ipmi > 0 && is_numeric($ipmi))
{

5
pts-core/objects/pts_result_file_analyzer.php
View File

@@ -773,8 +773,10 @@ class pts_result_file_analyzer
'cpu.temp' => 'CPU Temp',
'gpu.temp' => 'GPU Temp',
'hdd.temp' => 'Drive Temp',
'memory.temp' => 'Memory Temp',
);
$results = array();
$results_units = array();
foreach($result_file->get_result_objects() as &$result)
{
if(stripos($result->get_arguments_description(), ' Monitor') === false || $result->test_profile->get_display_format() != 'LINE_GRAPH')
@@ -822,6 +824,7 @@ class pts_result_file_analyzer
if(!isset($results[$this_sensor][$ri]))
{
$results[$this_sensor][$ri] = array();
$results_units[$this_sensor] = $result->test_profile->get_result_scale();
}
$results[$this_sensor][$ri]= array_merge($results[$this_sensor][$ri], $r);
}
@@ -915,7 +918,7 @@ class pts_result_file_analyzer
$test_result->test_profile->set_version(null);
$test_result->test_profile->set_result_proportion(null);
$test_result->test_profile->set_display_format('LINE_GRAPH');
$test_result->test_profile->set_result_scale('Watts');
$test_result->test_profile->set_result_scale($results_units[$set_identifier]);
//$test_result->test_profile->set_result_proportion('HIB');
$test_result->set_used_arguments_description('Accumulated ' . $set_identifier . ' Monitoring');
$test_result->set_used_arguments('Result Composite ' . $set_identifier);