More 10.4 prep

ChangeLog

@@ -1,14 +1,15 @@
 PHORONIX TEST SUITE CHANGE-LOG
 
-Phoronix Test Suite (Git)
+Phoronix Test Suite 10.4.0
+16 May 2021
 
 pts-core: Ubuntu 21.04 dependency updates for changed/removed package names
 pts-core: Add "auto-resolution-wide" option
 pts-core: Add $CPU_THREADS_PER_CORE helper
 pts-core: Allow perf-per-dollar-per-hour in the result viewer, extending perf-per-dollar HTML helper
 pts-core: Add PTS_EXTRA_SYSTEM_LOGS_DIR environment variable to allow pointing to directory of extra system log files
 pts-core: Add RepositoryURL option for test profiles
-phodevi: Intel Linux graphics string reporting improvement
+phodevi: Intel Linux graphics string format improvement
 phoromatic: Treat set context scripts as a file rather than executing it as a buffer
 phoromatic: Allow passing Phodevi system properties to Phoromatic Server
 phodevi: Add some new properties, port some pts_network info to phodevi interfaces

pts-core/objects/phodevi/components/phodevi_system.php

@@ -57,7 +57,8 @@ public static function properties()
 			'system-layer' => new phodevi_device_property('sw_system_layer', phodevi::no_caching),
 			'environment-variables' => new phodevi_device_property('sw_environment_variables', phodevi::std_caching),
 			'security-features' => new phodevi_device_property('sw_security_features', phodevi::std_caching),
-			'kernel-extra-details' => new phodevi_device_property('sw_kernel_extra_details', phodevi::std_caching)
+			'kernel-extra-details' => new phodevi_device_property('sw_kernel_extra_details', phodevi::std_caching),
+			'battery' => new phodevi_device_property('battery', phodevi::smart_caching),
 			);
 	}
 	public static function sw_username()
@@ -2095,6 +2096,25 @@ public static function sw_wine_version()
 
 		return $wine_version;
 	}
+	public static function battery()
+	{
+		$batteries = array();
+		if(phodevi::is_linux())
+		{
+			foreach(pts_file_io::glob('/sys/class/power_supply/BAT*/model_name') as $bat_path)
+			{
+				$bat_model = pts_file_io::file_get_contents($bat_path);
+				$bat_dir = dirname($bat_path);
+				$bat_manufacturer = is_file($bat_dir . '/manufacturer') ? pts_file_io::file_get_contents($bat_dir . '/manufacturer') : null;
+				if(!empty($bat_model))
+				{
+					$batteries[] = trim($bat_manufacturer . ' ' . $bat_model);
+				}
+			}
+		}
+
+		return implode(' + ', $batteries);
+	}
 }
 
 ?>

release-highlights.md

@@ -1,5 +1,10 @@
 # Phoronix Test Suite Release History
 
+Phoronix Test Suite 10.4
+======
+#### Release Date: 16 May 2021 | Codename: Ibestad
+* Various optimizations and enhancements
+
 Phoronix Test Suite 10.2
 ======
 #### Release Date: 5 January 2021 | Codename: Harstad