mirror of https://framagit.org/kyodev/kyopages.git
getInfo 2.22.1
This commit is contained in:
kyodev
parent
c7dfefee9f
commit
f01769249d
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=2.22.0
|
||||
version=2.22.1
|
||||
date="02/11/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
|
|
@ -403,7 +403,7 @@ fi_cpu(){ # 01/11/2017
|
|||
[ ${fg_cpu:0:1} -gt 1 ] && pluriel="s" || unset pluriel
|
||||
text="## processeur$pluriel \n\n"
|
||||
f_display "fg_cpu" "sans"
|
||||
[ "$fg_codename" ] && f_display "fg_codename" "var" "codename processeur"
|
||||
[ "$fg_uarch" ] && f_display "fg_uarch" "var" "codename processeur"
|
||||
f_display "cpu_flags" "var" "flags cpu:"
|
||||
printf "$text\n" >> "$fileOutput"
|
||||
unset text
|
||||
|
|
@ -1241,9 +1241,10 @@ figet_batt(){ #v2 01/11/2017
|
|||
[ "$batt_detail" ] && fg_batt=${batt_detail::-1} # suppression dernier $'\n'
|
||||
}
|
||||
|
||||
# assigne $fg_cpu (3 lignes description cpu), fg_nb_threads, $fg_cpu_arch, $fg_codename
|
||||
figet_cpu(){ #v2 01/11/2017
|
||||
# assigne $fg_cpu (3 lignes description cpu), fg_nb_threads, $fg_cpu_arch, $fg_uarch
|
||||
figet_cpu(){ #v2 02/11/2017
|
||||
local cpuinfo speedNom speedMax speedMin speedCpu cpu1 cpu2 cpu3 var_temp vendor family model
|
||||
local defaut_model="modèle non répertorié" defaut_family="famille non répertoriée"
|
||||
cpuinfo="$(cat /proc/cpuinfo)"
|
||||
# speed
|
||||
speedNom=$(gawk -F ':' '/cpu MHz/ {printf "%.2f", $2/1000;exit}' <<< "$cpuinfo")
|
||||
|
|
@ -1289,47 +1290,64 @@ figet_cpu(){ #v2 01/11/2017
|
|||
# arch processeur
|
||||
[ $(grep -cm1 'flags.* lm ' /proc/cpuinfo) -ge 1 ] && fg_cpu_arch="64bits" || fg_cpu_arch="32bits"
|
||||
# traitement µarchitecture
|
||||
vendor=$(grep -m1 '^vendor_id' /proc/cpuinfo) # family cpuinfo
|
||||
vendor=${vendor#*: } # extraction valeur family
|
||||
vendor=$(grep -m1 '^vendor_id' /proc/cpuinfo) # vendor cpuinfo
|
||||
vendor=${vendor#*: } # extraction valeur vendor
|
||||
var_temp=$(grep -m1 '^cpu family' /proc/cpuinfo) # family cpuinfo
|
||||
var_temp=${var_temp#*: } # extraction valeur family
|
||||
family=$(printf "%.2X" $var_temp) # conversion hexa
|
||||
var_temp=$(grep -m1 '^model' /proc/cpuinfo) # model cpuinfo
|
||||
var_temp=${var_temp#*: } # extraction valeur model
|
||||
model=$(printf "%.2X" $var_temp) # conversion hexa
|
||||
var_temp=${var_temp#*: } # extraction valeur family
|
||||
family=$(printf "%.2X" $var_temp) # conversion hexa family
|
||||
var_temp=$(grep -m1 '^model' /proc/cpuinfo) # model cpuinfo
|
||||
var_temp=${var_temp#*: } # extraction valeur model
|
||||
model=$(printf "%.2X" $var_temp) # conversion hexa model
|
||||
case ${vendor,,} in
|
||||
*intel*)
|
||||
case $family in
|
||||
05 | 0F) fg_codename="Intel ancienne famille non répertoriée";;
|
||||
04) fg_uarch="Intel 80486";;
|
||||
05)
|
||||
case $model in
|
||||
01 | 02 | 03 | 07) fg_uarch="Intel P5 (Pentium)";; # arch_x86
|
||||
04 | 08) fg_uarch="Intel P5 (Pentium MMX)";; # arch_x86
|
||||
09) fg_uarch="Intel Quark";; # arch_x86
|
||||
*) fg_uarch="Intel $defaut_model";;
|
||||
esac ;;
|
||||
0B) fg_uarch="Knights Corner (Xeon Phi)";; # arch_x86?
|
||||
0F)
|
||||
case $model in
|
||||
00 | 01 | 02) fg_uarch="Intel NetBurst (P4)";; # arch_x86?
|
||||
03 | 04 | 06) fg_uarch="Intel NetBurst (Nocona Prescott)";; # arch_x86?
|
||||
*) fg_uarch="Intel $defaut_model";;
|
||||
esac ;;
|
||||
06)
|
||||
case $model in
|
||||
01 | 07 | 08 | 0A | 0B | 0E) fg_codename="Intel ancien produit non répertorié";;
|
||||
03 | 04 | 05) fg_codename="Intel Prescott 90nm";; # arch_x86
|
||||
09 | 15 | 0D) fg_codename="Intel Dothan 90nm";; # arch_x86
|
||||
06) fg_codename="Intel Presler 65nm";; # arch_x86
|
||||
0F | 16) fg_codename="Intel Merom 65nm";;
|
||||
17 | 1D) fg_codename="Intel Penryn 45nm";;
|
||||
1A | 1E | 1F | 2E) fg_codename="Intel Nehalem 45nm";;
|
||||
25 | 2C | 2F) fg_codename="Intel Westmere 32nm";;
|
||||
2A | 2D) fg_codename="Intel Sandy Bridge 32nm";;
|
||||
3A | 3E) fg_codename="Intel Ivy Bridge 22nm";;
|
||||
3C | 3F | 45 | 46) fg_codename="Intel Haswell 22nm";;
|
||||
3D | 47 | 4F | 56) fg_codename="Intel Broadwell 14nm";;
|
||||
4E | 55 | 5E) fg_codename="Intel Skylake 14nm";;
|
||||
8E | 9E) fg_codename="Intel Kaby Lake 14nm";;
|
||||
01) fg_uarch="Intel Pentium Pro";; # arch_x86
|
||||
03 | 04 | 05) fg_uarch="Intel Prescott (Pentium II) 90nm";; # arch_x86
|
||||
06) fg_uarch="Intel Presler (Pentium II) 65nm";; # arch_x86
|
||||
07 | 08 | 0A | 0B) fg_uarch="Intel (Pentium III)";; # arch_x86
|
||||
09 | 15 | 0D) fg_uarch="Intel Dothan (Pentium M) 90nm";; # arch_x86
|
||||
0E) fg_uarch="Intel Core";; # arch_x86
|
||||
0F | 16) fg_uarch="Intel Merom (Core2) 65nm";;
|
||||
17 | 1D) fg_uarch="Intel Penryn (Core2) 45nm";;
|
||||
1A | 1E | 1F | 2E) fg_uarch="Intel Nehalem 45nm";;
|
||||
25 | 2C | 2F) fg_uarch="Intel Westmere 32nm";;
|
||||
2A | 2D) fg_uarch="Intel Sandy Bridge 32nm";;
|
||||
3A | 3E) fg_uarch="Intel Ivy Bridge 22nm";;
|
||||
3C | 3F | 45 | 46) fg_uarch="Intel Haswell 22nm";;
|
||||
3D | 47 | 4F | 56) fg_uarch="Intel Broadwell 14nm";;
|
||||
4E | 55 | 5E) fg_uarch="Intel Skylake 14nm";;
|
||||
8E | 9E) fg_uarch="Intel Kaby Lake 14nm";;
|
||||
# atom
|
||||
26 | 1C) fg_codename="Intel Atom Bonnell 45nm";;
|
||||
27 |35 |36) fg_codename="Intel Atom Saltwell 32nm";;
|
||||
37 | 4A | 4D | 5A) fg_codename="Intel Atom Silvermont 22nm";;
|
||||
4C | 5D | 5F) fg_codename="Intel Atom Airmont 14nm";;
|
||||
* ) fg_codename="Intel non répertorié, issue à ouvrir";;
|
||||
26 | 1C) fg_uarch="Intel Atom Bonnell 45nm";;
|
||||
27 |35 |36) fg_uarch="Intel Atom Saltwell 32nm";;
|
||||
37 | 4A | 4D | 5A) fg_uarch="Intel Atom Silvermont 22nm";;
|
||||
4C | 5D | 5F) fg_uarch="Intel Atom Airmont 14nm";;
|
||||
# Knights-series cores
|
||||
0x57) fg_codename="Intel knights_landing";;
|
||||
0x85) fg_codename="Intel knights_mill";;
|
||||
0x57) fg_uarch="Intel knights_landing";;
|
||||
0x85) fg_uarch="Intel knights_mill";;
|
||||
*) fg_uarch="Intel $defaut_model";;
|
||||
esac ;;
|
||||
esac ;;
|
||||
*) fg_uarch="Intel $defaut_family";;
|
||||
esac ;;
|
||||
esac
|
||||
fg_codename+=" {0x$family|0x$model}"
|
||||
fg_uarch+=" {0x$family|0x$model}"
|
||||
}
|
||||
|
||||
figet_de(){ # thanks neofetch, assigne $fg_de #30/10/2017
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* f__wcv
|
||||
|
||||
|
||||
## 2.22.0 02/11/2017
|
||||
## 2.22.1 02/11/2017
|
||||
|
||||
nouveau: µarchitecture proc intel
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue