hw_partner
/
urmic_transcoder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

This commit is contained in:
devdatt 2026-01-18 14:17:50 +05:30
parent 4d5b936c5f
commit e703fcc068
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
html/input.php
View File

@ -17,7 +17,6 @@ function getNumaTopology(): array
if (preg_match('/node (\d+) cpus:\s+(.*)/', $line, $m)) { if (preg_match('/node (\d+) cpus:\s+(.*)/', $line, $m)) {
$node = (int)$m[1]; $node = (int)$m[1];
$cpus = array_map('intval', preg_split('/\s+/', trim($m[2]))); $cpus = array_map('intval', preg_split('/\s+/', trim($m[2])));
sort($cpus); sort($cpus);
$nodes[$node] = $cpus; $nodes[$node] = $cpus;
} }
@ -27,7 +26,7 @@ function getNumaTopology(): array
return $nodes; return $nodes;
} }
/* Allocate core with EVEN-first, ODD-later round robin */ /* Allocate core with EVEN-first, ODD-later, safe round robin */
function allocateCore(int $serviceId): array function allocateCore(int $serviceId): array
{ {
global $coreFile; global $coreFile;
@ -35,10 +34,7 @@ function allocateCore(int $serviceId): array
$map = json_decode(file_get_contents($coreFile), true) ?: []; $map = json_decode(file_get_contents($coreFile), true) ?: [];
$nodes = getNumaTopology(); $nodes = getNumaTopology();
$nodeIds = array_keys($nodes); if (empty($nodes)) {
$nodeCount = count($nodeIds);
if ($nodeCount === 0) {
return ["node" => 0, "cpu" => 0]; return ["node" => 0, "cpu" => 0];
} }
@ -51,13 +47,13 @@ function allocateCore(int $serviceId): array
$index = count($map); $index = count($map);
/* Count total EVEN cores across all nodes */ /* Count total EVEN cores */
$totalEven = 0; $totalEven = 0;
foreach ($even as $cpus) { foreach ($even as $cpus) {
$totalEven += count($cpus); $totalEven += count($cpus);
} }
/* Decide phase: EVEN cores first, then ODD */ /* Select phase */
if ($index < $totalEven) { if ($index < $totalEven) {
$phaseCpus = $even; $phaseCpus = $even;
$phaseIndex = $index; $phaseIndex = $index;
@ -66,22 +62,35 @@ function allocateCore(int $serviceId): array
$phaseIndex = $index - $totalEven; $phaseIndex = $index - $totalEven;
} }
/* Build list of nodes that actually have CPUs in this phase */
$activeNodes = [];
foreach ($phaseCpus as $n => $cpus) {
if (!empty($cpus)) {
$activeNodes[$n] = $cpus;
}
}
if (empty($activeNodes)) {
// Absolute fallback (should never happen)
return ["node" => 0, "cpu" => 0];
}
$nodeIds = array_keys($activeNodes);
$nodeCount = count($nodeIds);
/* /*
* Round robin math * Correct round-robin math
* nodeIndex = phaseIndex % nodeCount * First exhaust core index across all nodes,
* coreIndex = floor(phaseIndex / nodeCount) * then move to next core.
*/ */
$nodeIndex = $phaseIndex % $nodeCount; $nodeIndex = $phaseIndex % $nodeCount;
$coreIndex = intdiv($phaseIndex, $nodeCount); $coreIndex = intdiv($phaseIndex, $nodeCount);
$node = $nodeIds[$nodeIndex]; $node = $nodeIds[$nodeIndex];
$cpuList = $activeNodes[$node];
if (!isset($phaseCpus[$node][$coreIndex])) { // Safe wrap (never divide by zero now)
/* Wrap safely if uneven core counts */ $cpu = $cpuList[$coreIndex % count($cpuList)];
$coreIndex = $coreIndex % count($phaseCpus[$node]);
}
$cpu = $phaseCpus[$node][$coreIndex];
$map[$serviceId] = [ $map[$serviceId] = [
"node" => $node, "node" => $node,