From 5083f85d8a298ba71f1cf4ca9a5a6aef70f9102c Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Wed, 22 Oct 2025 22:00:41 +0100
Subject: [PATCH] Remove test code

---
 emhttp/plugins/dynamix/DashStats.page      |  2 --
 emhttp/plugins/dynamix/include/cpulist.php | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 emhttp/plugins/dynamix/include/cpulist.php

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index c2863c20e..1259ff11b 100755
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -95,7 +95,6 @@ foreach ($devs as $disk) {
 
 $array_percent = number_format(100*$array_used/($array_size ?: 1),1,$dot,'');
 $cpus=get_cpu_packages();
-$cpus[] = ["16,17"];
 $wg_up      = $wireguard ? exec("wg show interfaces") : '';
 $wg_up      = $wg_up ? explode(' ',$wg_up) : [];
 $up         = count($wg_up);
@@ -1456,7 +1455,6 @@ var recall  = null;
 var recover = null;
 var tempunit="<?=_var($display,'unit','C');?>";
 
-
 // Helper function to calculate millisPerPixel based on container width
 function getMillisPerPixel(timeInSeconds, containerId) {
   var container = document.getElementById(containerId);
diff --git a/emhttp/plugins/dynamix/include/cpulist.php b/emhttp/plugins/dynamix/include/cpulist.php
new file mode 100644
index 000000000..8d1db3573
--- /dev/null
+++ b/emhttp/plugins/dynamix/include/cpulist.php
@@ -0,0 +1,22 @@
+<?php
+function get_cpu_packages(string $separator = ','): array {
+    $packages = [];
+
+    foreach (glob("/sys/devices/system/cpu/cpu[0-9]*/topology/thread_siblings_list") as $path) {
+        $pkg_id   = (int)file_get_contents(dirname($path) . "/physical_package_id");
+        $siblings = str_replace(",", $separator, trim(file_get_contents($path)));
+
+        if (!in_array($siblings, $packages[$pkg_id] ?? [])) {
+            $packages[$pkg_id][] = $siblings;
+        }
+    }
+
+    // Sort groups within each package by first CPU number
+    foreach ($packages as &$list) {
+        $keys = array_map(fn($s) => (int)explode($separator, $s)[0], $list);
+        array_multisort($keys, SORT_ASC, SORT_NUMERIC, $list);
+    }
+    unset($list);
+
+    return $packages;
+}