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-11-24 07:54:36 -06:00
parent 5167450443
commit 8c171bb197
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pts-core/modules/system_monitor.php
View File

@@ -59,7 +59,7 @@ class system_monitor extends pts_module_interface
$info .= ' - ' . $arg . PHP_EOL;
}
$info .= PHP_EOL . 'NOTE: Use the "system-sensors" command to see what sensors are available for monitoring on the system.' . PHP_EOL;
$info .= PHP_EOL . 'NOTE: Use the "phoronix-test-suite system-sensors" command to see what sensors are available for monitoring on the system.' . PHP_EOL;
return $info;
}
@@ -86,11 +86,6 @@ class system_monitor extends pts_module_interface
self::create_monitoring_cgroups();
self::print_monitored_sensors();
self::set_monitoring_interval();
// Pad some idling sensor results at the start
//sleep((self::$sensor_monitoring_frequency * 8));
//self::pts_start_monitoring();
}
catch(Exception $e)
{
@@ -419,8 +414,7 @@ class system_monitor extends pts_module_interface
$sensor_type_exists = array_key_exists($sensor[0], $sensor_parameters);
$sensor_name_exists = $sensor_type_exists && array_key_exists($sensor[1], $sensor_parameters[$sensor[0]]);
$monitor_all_of_this_type = $sensor_type_exists && array_key_exists('all', $sensor_parameters[$sensor[0]]);
$monitor_all_of_this_sensor = $sensor_type_exists && $sensor_name_exists
&& in_array('all', $sensor_parameters[$sensor[0]][$sensor[1]]);
$monitor_all_of_this_sensor = $sensor_type_exists && $sensor_name_exists && in_array('all', $sensor_parameters[$sensor[0]][$sensor[1]]);
$is_cgroup_sensor = $sensor[0] === 'cgroup';
if(($monitor_all && !$is_cgroup_sensor) || $monitor_all_of_this_type || $sensor_name_exists )

7
pts-core/objects/pts_Graph/pts_graph_core.php
View File

@@ -314,7 +314,12 @@ abstract class pts_graph_core
$config['size']['tick_mark'] = 10;
$config['size']['key'] = 9;
if(defined('OPENBENCHMARKING_BUILD'))
if(isset($_REQUEST['phoronix_export']))
{
$config['text']['watermark'] = 'Phoronix.com';
$config['text']['watermark_url'] = 'https://www.phoronix.com/';
}
else if(defined('OPENBENCHMARKING_BUILD'))
{
$config['text']['watermark'] = 'OpenBenchmarking.org';
if(defined('OPENBENCHMARKING_WATERMARK_URL'))

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

@@ -769,8 +769,10 @@ class pts_result_file_analyzer
'gpu.power' => 'GPU Power Consumption',
'sys.power' => 'System Power Consumption',
'cpu.peak-freq' => 'CPU Peak Freq',
'cpu.usage' => 'CPU Usage',
'cpu.temp' => 'CPU Temp',
'gpu.temp' => 'GPU Temp',
'hdd.temp' => 'Drive Temp',
);
$results = array();
foreach($result_file->get_result_objects() as &$result)
@@ -891,7 +893,7 @@ class pts_result_file_analyzer
}
foreach($results as $identifier_set => $result_set)
{
foreach($reset_set as $identifier => $values)
foreach($result_set as $identifier => $values)
{
if(count($values) < 2)
{