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:07:29 +05:30
parent 81794a3361
commit 7f83427ce8
1 changed files with 73 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
html/input.php
View File

@ -1,13 +1,15 @@
<?php include 'header.php'; ?> <?php include 'header.php'; ?>
<?php <?php
<?php
$coreFile = "/var/www/core.json"; $coreFile = "/var/www/core.json";
if (!file_exists($coreFile)) { if (!file_exists($coreFile)) {
file_put_contents($coreFile, json_encode([])); file_put_contents($coreFile, json_encode([]));
} }
/* Get NUMA topology with PHYSICAL cores only */ /* Read NUMA topology */
function getNumaTopology(): array function getNumaTopology(): array
{ {
$out = shell_exec("numactl --hardware"); $out = shell_exec("numactl --hardware");
@ -18,9 +20,7 @@ function getNumaTopology(): array
$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])));
// keep even CPUs only (physical cores) sort($cpus);
$cpus = array_values(array_filter($cpus, fn($c) => $c % 2 === 0));
$nodes[$node] = $cpus; $nodes[$node] = $cpus;
} }
} }
@ -29,7 +29,7 @@ function getNumaTopology(): array
return $nodes; return $nodes;
} }
/* Allocate core: core-index first, node second */ /* Allocate core with EVEN-first, ODD-later round robin */
function allocateCore(int $serviceId): array function allocateCore(int $serviceId): array
{ {
global $coreFile; global $coreFile;
@ -44,27 +44,46 @@ function allocateCore(int $serviceId): array
return ["node" => 0, "cpu" => 0]; return ["node" => 0, "cpu" => 0];
} }
// total services already allocated /* Split CPUs per node */
$even = $odd = [];
foreach ($nodes as $n => $cpus) {
$even[$n] = array_values(array_filter($cpus, fn($c) => $c % 2 === 0));
$odd[$n] = array_values(array_filter($cpus, fn($c) => $c % 2 === 1));
}
$index = count($map); $index = count($map);
/* Count total EVEN cores across all nodes */
$totalEven = 0;
foreach ($even as $cpus) {
$totalEven += count($cpus);
}
/* Decide phase: EVEN cores first, then ODD */
if ($index < $totalEven) {
$phaseCpus = $even;
$phaseIndex = $index;
} else {
$phaseCpus = $odd;
$phaseIndex = $index - $totalEven;
}
/* /*
* ROUND-ROBIN MATH (IMPORTANT) * Round robin math
* * nodeIndex = phaseIndex % nodeCount
* coreIndex = floor(index / nodeCount) * coreIndex = floor(phaseIndex / nodeCount)
* nodeIndex = index % nodeCount
*/ */
$coreIndex = intdiv($index, $nodeCount); $nodeIndex = $phaseIndex % $nodeCount;
$nodeIndex = $index % $nodeCount; $coreIndex = intdiv($phaseIndex, $nodeCount);
$node = $nodeIds[$nodeIndex]; $node = $nodeIds[$nodeIndex];
// wrap core index safely if cores exhausted if (!isset($phaseCpus[$node][$coreIndex])) {
$coreCount = count($nodes[$node]); /* Wrap safely if uneven core counts */
if ($coreCount === 0) { $coreIndex = $coreIndex % count($phaseCpus[$node]);
return ["node" => $node, "cpu" => 0];
} }
$cpu = $nodes[$node][$coreIndex % $coreCount]; $cpu = $phaseCpus[$node][$coreIndex];
$map[$serviceId] = [ $map[$serviceId] = [
"node" => $node, "node" => $node,
@ -95,6 +114,43 @@ function getServiceCore(int $serviceId): ?array
return $map[$serviceId] ?? null; return $map[$serviceId] ?? null;
} }
$jsonFile = __DIR__ . "/input.json";
if (!file_exists($jsonFile)) {
file_put_contents($jsonFile, json_encode([]));
}
$data = json_decode(file_get_contents($jsonFile), true);
/* Fix old entries missing service_name or volume */
foreach ($data as $k => $d) {
if (!isset($d["service_name"])) $data[$k]["service_name"] = "";
if (!isset($d["volume"])) $data[$k]["volume"] = "0";
}
file_put_contents($jsonFile, json_encode($data, JSON_PRETTY_PRINT));
/* ---------------- ADD NEW ---------------- */
if ($_SERVER["REQUEST_METHOD"] === "POST" && $_POST["action"] === "add") {
$new = [
"id" => time(),
"service_name" => $_POST["service_name"],
"input_udp" => $_POST["input_udp"],
"output_udp" => $_POST["output_udp"],
"video_format" => $_POST["video_format"],
"audio_format" => $_POST["audio_format"],
"resolution" => $_POST["resolution"],
"video_bitrate" => $_POST["video_bitrate"],
"audio_bitrate" => $_POST["audio_bitrate"],
"volume" => $_POST["volume"],
"service" => $_POST["service"]
];
$data[] = $new;
file_put_contents($jsonFile, json_encode($data, JSON_PRETTY_PRINT));
$alloc = getServiceCore($id);
if ($alloc === null) {
$alloc = allocateCore($id);
}
$core = (int)$alloc["cpu"]; $core = (int)$alloc["cpu"];
$node = (int)$alloc["node"]; $node = (int)$alloc["node"];