Skip to content

fix: parse dmidecode memory capacity labels consistently across versions #2562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
limetech merged 1 commit into from
Mar 7, 2026
Merged

fix: parse dmidecode memory capacity labels consistently across versions #2562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 24 additions & 13 deletions emhttp/plugins/dynamix/DashStats.page
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,34 +163,45 @@ $total = exec("awk '/^MemTotal/{print $2*1024}' /proc/meminfo");
unset($ports); exec("ls --indicator-style=none /sys/class/net|grep -Po '^(bond|eth|wlan)\d+$'",$ports);
$ports[] = 'lo';

$sizes = ['MB','GB','TB'];
$memory_units = [
// dmidecode reports memory capacities using binary math; treat both SI and IEC labels as base-1024.
// This keeps parsing consistent across dmidecode versions that may print GB/TB or GiB/TiB.
'kb' => 1/1024, 'kib' => 1/1024,
'mb' => 1, 'mib' => 1,
'gb' => 1024, 'gib' => 1024,
'tb' => 1048576,'tib' => 1048576,
'pb' => 1073741824, 'pib' => 1073741824
];
$parse_memory_to_mib = function($value) use ($memory_units) {
if (!preg_match('/([0-9.]+)\s*([A-Za-z]+)/',$value ?? '',$match)) return 0;
$size = (float)$match[1];
$unit = strtolower($match[2]);
return isset($memory_units[$unit]) ? (int)round($size*$memory_units[$unit]) : 0;
};
$memory_type = $ecc = '';
$memory_installed = $memory_maximum = 0;
$memory_devices = dmidecode('Memory Device','17');
foreach ($memory_devices as $device) {
if (!is_numeric($device['Size'][0])) continue;
[$size, $unit] = my_explode(' ',$device['Size']??'');
$base = array_search($unit,$sizes);
if ($base!==false) $memory_installed += $size*pow(1024,$base);
$memory_installed += $parse_memory_to_mib($device['Size'] ?? '');
if (!$memory_type && isset($device['Type']) && $device['Type']!='Unknown') $memory_type = $device['Type'];
}
$memory_array = dmidecode('Physical Memory Array','16');
foreach ($memory_array as $device) {
[$size, $unit] = my_explode(' ',$device['Maximum Capacity']??'');
$base = array_search($unit,$sizes);
if ($base>=1) $memory_maximum += $size*pow(1024,$base);
$memory_maximum += $parse_memory_to_mib($device['Maximum Capacity'] ?? '');
if (!$ecc && isset($device['Error Correction Type']) && $device['Error Correction Type']!='None') $ecc = "{$device['Error Correction Type']} ";
}
if ($memory_installed >= 1048576) {
$memory_installed = round($memory_installed/1048576);
$memory_maximum = round($memory_maximum/1048576);
$unit = 'TiB';
$memory_unit = 'TiB';
} else {
if ($memory_installed >= 1024) {
$memory_installed = round($memory_installed/1024);
$memory_maximum = round($memory_maximum/1024);
$unit = 'GiB';}
else $unit = 'MiB'; }
$memory_unit = 'GiB';}
else $memory_unit = 'MiB'; }

$unit = $memory_unit;

// get system resources size
exec("df --output=size /boot /var/log /var/lib/docker 2>/dev/null|awk '(NR>1){print $1*1024}'",$df);
Expand Down Expand Up @@ -458,7 +469,7 @@ switch ($themeHelper->getThemeName()) { // $themeHelper set in DefaultPageLayout
<span class='flex flex-row flex-wrap items-center gap-4'>
<span class="head_info">
<span>
<i class='ups fa fa-line-chart'></i>_(Memory)_: <?="$memory_installed $unit $memory_type $ecc"?>
<i class='ups fa fa-line-chart'></i>_(Memory)_: <?="$memory_installed $memory_unit $memory_type $ecc"?>
</span>
</span>
<span class="switch">
Expand Down Expand Up @@ -489,7 +500,7 @@ switch ($themeHelper->getThemeName()) { // $themeHelper set in DefaultPageLayout
<div class="tile-system-memory-labels">
<div>
<i class='ups fa fa-compress'></i>_(Usable size)_: <?=$ramsize?><br>
<i class='ups fa fa-expand'></i>_(Maximum size)_: <?="$memory_maximum $unit"?><?=$low?'*':''?>
<i class='ups fa fa-expand'></i>_(Maximum size)_: <?="$memory_maximum $memory_unit"?><?=$low?'*':''?>
</div>
<div>
<legend>_(Legend)_</legend>
Expand Down
41 changes: 30 additions & 11 deletions emhttp/plugins/dynamix/scripts/system_information
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,38 +83,57 @@ if (!empty($iommu_groups)) {
$iommu .= '</a>';
}

$normalize_binary_unit = function($value) {
return preg_replace_callback('/\b([KMGTPE]?)(?:i)?B\b/i',function($match) {
$prefix = strtoupper($match[1] ?? '');
return $prefix ? "{$prefix}iB" : 'B';
},$value ?? '');
};

$cache_installed = [];
$cache_devices = dmidecode('Cache Information',7);
foreach ($cache_devices as $device) $cache_installed[] = $device['Socket Designation'].": ".str_replace(['kB','B'],['KB','iB'],$device['Installed Size']);
foreach ($cache_devices as $device) {
$cache_installed[] = $device['Socket Designation'].": ".$normalize_binary_unit($device['Installed Size'] ?? '');
}

/*
Memory Device (16) will get us each ram chip. By matching on MB it'll filter out Flash/Bios chips
Sum up all the Memory Devices to get the amount of system memory installed. Convert MB to GB
Sum up all the Memory Devices to get the amount of system memory installed. Convert MiB to GiB
Physical Memory Array (16) usually one of these for a desktop-class motherboard but higher-end xeon motherboards
might have two or more of these. The trick is to filter out any Flash/Bios types by matching on GB
might have two or more of these. The trick is to filter out any Flash/Bios types by matching on GiB
Sum up all the Physical Memory Arrays to get the motherboard's total memory capacity
Extract error correction type, if none, do not include additional information in the output
If maximum < installed then roundup maximum to the next power of 2 size of installed. E.g. 6 -> 8 or 12 -> 16
*/
$sizes = ['MB','GB','TB'];
$memory_units = [
// dmidecode reports memory capacities using binary math; treat both SI and IEC labels as base-1024.
// This keeps parsing consistent across dmidecode versions that may print GB/TB or GiB/TiB.
'kb' => 1/1024, 'kib' => 1/1024,
'mb' => 1, 'mib' => 1,
'gb' => 1024, 'gib' => 1024,
'tb' => 1048576,'tib' => 1048576,
'pb' => 1073741824, 'pib' => 1073741824
];
$parse_memory_to_mib = function($value) use ($memory_units) {
if (!preg_match('/([0-9.]+)\s*([A-Za-z]+)/',$value ?? '',$match)) return 0;
$size = (float)$match[1];
$unit = strtolower($match[2]);
return isset($memory_units[$unit]) ? (int)round($size*$memory_units[$unit]) : 0;
};
$memory_type = $ecc = '';
$memory_installed = $memory_maximum = 0;
$memory_devices = dmidecode('Memory Device',17);
$modules = 0;
foreach ($memory_devices as $device) {
if (empty($device['Type']) || $device['Type']=='Unknown') continue;
[$size, $unit] = my_explode(' ',$device['Size']);
$base = array_search($unit,$sizes);
if ($base!==false) $memory_installed += $size*pow(1024,$base);
$memory_installed += $parse_memory_to_mib($device['Size'] ?? '');
if (!$memory_type) $memory_type = $device['Type'];
$modules++;
}
$memory = $modules > 1 ? "<span class='link blue-text' onclick=\"$('tr.ram').toggle()\">"._('Memory').":</span>" : _('Memory').':';
$memory_array = dmidecode('Physical Memory Array',16);
foreach ($memory_array as $device) {
[$size, $unit] = my_explode(' ',$device['Maximum Capacity']);
$base = array_search($unit,$sizes);
if ($base>=1) $memory_maximum += $size*pow(1024,$base);
$memory_maximum += $parse_memory_to_mib($device['Maximum Capacity'] ?? '');
if (!$ecc && isset($device['Error Correction Type']) && $device['Error Correction Type']!='None') $ecc = $device['Error Correction Type']." ";
}
if ($memory_installed >= 1048576) {
Expand Down Expand Up @@ -152,7 +171,7 @@ span.link{text-decoration:underline;cursor:pointer}
<?
foreach ($memory_devices as $device) {
if (empty($device['Type']) || $device['Type']=='Unknown') continue;
$size = preg_replace('/( .)B$/','$1iB',_var($device,'Size',0));
$size = $normalize_binary_unit(_var($device,'Size',0));
echo "<tr class='ram'><td></td><td>",$device['Locator'],": ",_var($device,'Manufacturer')," ",_var($device,'Part Number'),", $size ",_var($device,'Type')," @ ",_var($device,'Configured Memory Speed'),"</td></tr>";
}

Expand Down
Loading