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

pts-core: Couple fixes

Browse Source
This commit is contained in:
Michael Larabel
2024-10-05 05:56:29 -05:00
parent d1119ab3ec
commit 106ea700a8
5 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pts-core/external-test-dependencies/xml/ubuntu-packages.xml
View File

@@ -88,7 +88,7 @@
</Package>
<Package>
<GenericName>java</GenericName>
<PackageName>openjdk-11-jdk</PackageName>
<PackageName>default-jdk</PackageName>
</Package>
<Package>
<GenericName>maven</GenericName>

4
pts-core/objects/phodevi/components/phodevi_cpu.php
View File

@@ -1452,6 +1452,7 @@ class phodevi_cpu extends phodevi_device_interface
191 => 'Raptor Lake',
197 => 'Arrow Lake',
198 => 'Arrow Lake',
204 => 'Panther Lake',
207 => 'Emerald Rapids',
221 => 'Clearwater Forest',
),
@@ -1462,6 +1463,9 @@ class phodevi_cpu extends phodevi_device_interface
4 => 'Prescott',
6 => 'Cedar Mill',
),
19 => array(
1 => 'Diamond Rapids',
),
);
$other_map = array(

14
pts-core/objects/phodevi/sensors/sys_power.php
View File

@@ -32,6 +32,7 @@ class sys_power extends phodevi_sensor
private static $wattsup_meter_raw = false;
private static $ipmitool = false;
private static $ipmitool_ps = false;
private static $ipmitool_platform = false;
private static $ipmitool_dcmi = false;
private static $windows_battery = false;
private static $hwmon_power_meter = false;
@@ -121,6 +122,7 @@ class sys_power extends phodevi_sensor
}
if(pts_client::executable_in_path('ipmitool'))
{
// TODO add check for Platform Power A like on AvenueCity
$ipmi_read = phodevi_linux_parser::read_ipmitool_sensor('Node Power');
if($ipmi_read > 0 && is_numeric($ipmi_read))
@@ -144,6 +146,14 @@ class sys_power extends phodevi_sensor
self::$ipmitool_ps = true;
return true;
}
$ipmi_ps1 = phodevi_linux_parser::read_ipmitool_sensor('PSU1 Input Power');
//$ipmi_ps2 = phodevi_linux_parser::read_ipmitool_sensor('PS2_Input_Power');
if(is_numeric($ipmi_ps1) && $ipmi_ps1 > 1)
{
self::$ipmitool_platform = true;
return true;
}
}
}
public function read_sensor()
@@ -179,6 +189,10 @@ class sys_power extends phodevi_sensor
{
return phodevi_linux_parser::read_ipmitool_sensor('PS1_Input_Power', 0) + phodevi_linux_parser::read_ipmitool_sensor('PS2_Input_Power', 0);
}
else if(self::$ipmitool_platform)
{
return phodevi_linux_parser::read_ipmitool_sensor('PSU1 Input Power', 0) + phodevi_linux_parser::read_ipmitool_sensor('PSU2 Input Power', 0);
}
else if(self::$ipmitool_dcmi)
{
return phodevi_linux_parser::read_ipmitool_dcmi_power();

2
pts-core/objects/pts_result_viewer_embed.php
View File

@@ -1092,7 +1092,7 @@ class pts_result_viewer_embed
}
// Result export?
$result_title = (isset($_GET['result']) ? $_GET['result'] : 'result');
$result_title = (isset($_GET['result']) ? str_replace(',', '_', $_GET['result']) : 'result');
switch(isset($_REQUEST['export']) ? $_REQUEST['export'] : '')
{
case '':

10
pts-core/static/dynamic-result-viewer/index.php
View File

@@ -276,8 +276,14 @@ switch(isset($_GET['page']) ? $_GET['page'] : null)
$embed = new pts_result_viewer_embed($result_file, $results_viewing[0]);
$embed->allow_modifying_results(VIEWER_CAN_MODIFY_RESULTS && count($results_viewing) == 1);
$embed->allow_deleting_results(VIEWER_CAN_DELETE_RESULTS && count($results_viewing) == 1);
$call_get_result_html = true;
//$PAGE = $embed->get_html();
if(!isset($_REQUEST['export']))
{
$call_get_result_html = true;
}
else
{
$PAGE = $embed->get_html();
}
break;
case 'index':
default: