jinql
/
pi-dashboard
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix 64bit cpu info

pull/32/head
naosense 2023-09-21 09:09:34 +08:00
parent b91e3e84b2
commit f3513719e8
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
device.php
View File

@ -33,7 +33,7 @@ if (($str = @file("/proc/cpuinfo")) !== false){
@preg_match_all("/BogoMIPS\s{0,}\:+\s{0,}([\d\.]+)[\r\n]+/", $str, $bogomips); @preg_match_all("/BogoMIPS\s{0,}\:+\s{0,}([\d\.]+)[\r\n]+/", $str, $bogomips);
@preg_match_all("/Model\s{0,}\:+\s{0,}([\w\s\)\(\@.-]+)([\r\n]+)/s", $str, $pimodel); @preg_match_all("/Model\s{0,}\:+\s{0,}([\w\s\)\(\@.-]+)([\r\n]+)/s", $str, $pimodel);
if (false !== is_array($model[1])){ if (false){
$D['cpu']['count'] = sizeof($model[1]); $D['cpu']['count'] = sizeof($model[1]);
$bogomips[1][0] = ' | Bogomips:'.$bogomips[1][0]; $bogomips[1][0] = ' | Bogomips:'.$bogomips[1][0];
if($D['cpu']['count'] == 1){ if($D['cpu']['count'] == 1){
@ -43,18 +43,16 @@ if (($str = @file("/proc/cpuinfo")) !== false){
$D['cpu']['model'] = $model[1][0].$bogomips[1][0].' ×'.$D['cpu']['count']; $D['cpu']['model'] = $model[1][0].$bogomips[1][0].' ×'.$D['cpu']['count'];
} }
} else { } else {
if (($str = @shell_exec("lscpu")) !== false){ $str = shell_exec("lscpu");
$str = implode("", $str); @preg_match_all("/Model\s+name\s{0,}\:+\s{0,}([\w\s\)\(\@.-]+)([\r\n]+)/s", $str, $model);
@preg_match_all("/Model\s+name\s{0,}\:+\s{0,}([\w\s\)\(\@.-]+)([\r\n]+)/s", $str, $model); @preg_match_all("/CPU\(s\)\s{0,}\:+\s{0,}(\d+)([\r\n]+)/s", $str, $cpucnt);
@preg_match_all("/CPU\(s\)\s{0,}\:+\s{0,}(\d+)([\r\n]+)/s", $str, $cpucnt); if (false !== is_array($model[1])) {
if (false !== is_array($model[1])) { $D['cpu']['count'] = $cpucnt[1][0];
$D['cpu']['count'] = $cpucnt[1][0]; if($D['cpu']['count'] == 1){
if($D['cpu']['count'] == 1){ $D['cpu']['model'] = $model[1][0].' '.$bogomips[1][0];
$D['cpu']['model'] = $model[1][0].$bogomips[1][0]; }
} else{
else{ $D['cpu']['model'] = $model[1][0].' '.$bogomips[1][0].' ×'.$D['cpu']['count'];
$D['cpu']['model'] = $model[1][0].$bogomips[1][0].' ×'.$D['cpu']['count'];
}
} }
} }
} }