mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-24 02:58:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Dashboard rename CORE to CPU [2]

Browse Source
This commit is contained in:
bergware
2016-06-03 01:53:30 +02:00
parent 7fe130fc92
commit 0d1c35db3a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix/DashStats.page
+7 -7
View File
@@ -14,7 +14,7 @@ Title="Statistics"
*/
?>
<?
exec('cat /sys/devices/system/cpu/*/topology/thread_siblings_list|sort -nu', $cores);
exec('cat /sys/devices/system/cpu/*/topology/thread_siblings_list|sort -nu', $cpus);
$fans = exec("sensors -uA 2>/dev/null|grep -c 'fan[0-9]_input'");
$group = $var['shareSMBEnabled']=='yes' | $var['shareAFPEnabled']=='yes' | $var['shareNFSEnabled']=='yes';
$names = "";
@@ -175,16 +175,16 @@ echo "<td>Array Status</td>".implode('',$row0);
</td></tr><tr><td colspan='4'><center>Load Statistics</center></td></tr></thead>
<tbody>
<tr class='wide'><td>Avg. CPU load</td><td colspan='3'><div class='usage-disk sys'><span id='cpu' style='width:0'></span></div></td></tr>
<?if (count($cores)>1):?><tr><td rowspan='<?=count($cores)?>'><?else:?><tr class='wide'><td><?endif;?>Per CPU load</td>
<?if (count($cpus)>1):?><tr><td rowspan='<?=count($cpus)?>'><?else:?><tr class='wide'><td><?endif;?>Per CPU load</td>
<?
$tr = false;
foreach ($cores as $pair):
list($core1, $core2) = preg_split('/[,-]/',$pair);
foreach ($cpus as $pair):
list($cpu1, $cpu2) = preg_split('/[,-]/',$pair);
if ($tr) echo "<tr>";
if (isset($core2))
echo "<td>core $core1 / $core2</td><td><div class='usage-disk sys'><span id='cpu$core1' style='width:0'></span></div></td><td><div class='usage-disk sys'><span id='cpu$core2' style='width:0'></span></div></td>";
if (isset($cpu2))
echo "<td>cpu $cpu1 / $cpu2</td><td><div class='usage-disk sys'><span id='cpu$cpu1' style='width:0'></span></div></td><td><div class='usage-disk sys'><span id='cpu$cpu2' style='width:0'></span></div></td>";
else
echo "<td>core $core1</td><td colspan='2'><div class='usage-disk sys'><span id='cpu$core1' style='width:0'></span></div></td>";
echo "<td>cpu $cpu1</td><td colspan='2'><div class='usage-disk sys'><span id='cpu$cpu1' style='width:0'></span></div></td>";
echo "</tr>";
$tr = true;
endforeach;