Skip to content

Commit

Permalink
Add consumption monitoring to review mode
Browse files Browse the repository at this point in the history
  • Loading branch information
ThomasKaiser committed Feb 15, 2023
1 parent 0fd4428 commit de3cd42
Show file tree
Hide file tree
Showing 7 changed files with 799 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Results.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ So do **not** rely on collected numbers unless you carefully read through all th
| [Khadas VIM2](http://ix.io/1iJ7) | 1415/1000 MHz | 4.17 | Bionic arm64 | 5450 | 993 | 659600 | 1920 | 5920 | 8.59 |
| [Khadas VIM3](http://ix.io/1MFD) | 2200/1800 MHz | 4.9 | Bionic arm64 | 8600 | 2026 | 1256910 | 4980 | 9300 | 13.12 |
| [Khadas VIM3](http://ix.io/3R2Z) | 2400/2015 MHz | 5.10 | Bullseye arm64 | 9650 | 2376 | 1366350 | 4850 | 7380 | - |
| [Khadas VIM3](http://ix.io/3VfL) | 2400/2015 MHz | 5.10 | Focal arm64 | 9760 | 2374 | 1365900 | 4840 | 8260 | - |
| [Khadas VIM3](http://ix.io/4o1A) | 2400/2015 MHz | 6.0 | Bullseye arm64 | 9650 | 2379 | 1366300 | 5080 | 9240 | - |
| [Khadas VIM3L](http://ix.io/26Wy) | 1900 MHz | 4.9 | Bionic arm64 | 5160 | 1399 | 892110 | 3670 | 6360 | 7.29 |
| [Khadas VIM3L](http://ix.io/3Vdt) | 1900 MHz | 5.16 | Bullseye arm64 | 5110 | 1403 | 890730 | 3700 | 5140 | - |
| [Khadas VIM4](http://ix.io/3Wvv) | 2200/1970 MHz | 5.4 | Focal arm64 | 12090 | 2081 | 1253200 | 7810 | 11600 | - |
Expand Down
706 changes: 706 additions & 0 deletions results/4o1A.txt

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions results/Sorted-Results.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
| [OnePlus 5](http://ix.io/4fdD) | 2360/1900 MHz | 6.1 | Jammy arm64 | **9800** | 2474 | 883330 | 9720 | 14070 | 12.58 |
| [ODROID-N2+](http://ix.io/3DtN) | 2400/2015 MHz | 5.14 | Impish arm64 | **9790** | 2253 | 1366930 | 4300 | 7480 | - |
| [ODROID-N2+](http://ix.io/3LoH) | 2400/2015 MHz | 5.14 | Hirsute arm64 | **9780** | 2386 | 1366090 | 4030 | 7120 | - |
| [Khadas VIM3](http://ix.io/3VfL) | 2400/2015 MHz | 5.10 | Focal arm64 | **9760** | 2374 | 1365900 | 4840 | 8260 | - |
| [ODROID-N2+](http://ix.io/3R1a) | 2400/2015 MHz | 5.10 | Focal arm64 | **9680** | 2372 | 1366730 | 4030 | 7120 | - |
| [Khadas VIM3](http://ix.io/4o1A) | 2400/2015 MHz | 6.0 | Bullseye arm64 | **9650** | 2379 | 1366300 | 5080 | 9240 | - |
| [Khadas VIM3](http://ix.io/3R2Z) | 2400/2015 MHz | 5.10 | Bullseye arm64 | **9650** | 2376 | 1366350 | 4850 | 7380 | - |
| [Pentium J5005](http://ix.io/21rE) | 2700/1500 MHz | 5.0 | Bionic amd64 | **9230** | 2455 | 778360 | 5530 | 7130 | 20.74 |
| [ODROID-N2](http://ix.io/3MuT) | 2000/1900 MHz | 5.10 | Buster arm64 | **9090** | 2012 | 1085350 | 4260 | 9080 | - |
Expand Down Expand Up @@ -236,8 +236,8 @@
| [Pentium J5005](http://ix.io/21rE) | 2700/1500 MHz | 5.0 | Bionic amd64 | 9230 | **2455** | 778360 | 5530 | 7130 | 20.74 |
| [Amazon a1.xlarge](http://ix.io/2iFY) | 2300 MHz | 4.15 | Bionic arm64 | 8610 | **2406** | 1297960 | 4280 | 14220 | - |
| [ODROID-N2+](http://ix.io/3LoH) | 2400/2015 MHz | 5.14 | Hirsute arm64 | 9780 | **2386** | 1366090 | 4030 | 7120 | - |
| [Khadas VIM3](http://ix.io/4o1A) | 2400/2015 MHz | 6.0 | Bullseye arm64 | 9650 | **2379** | 1366300 | 5080 | 9240 | - |
| [Khadas VIM3](http://ix.io/3R2Z) | 2400/2015 MHz | 5.10 | Bullseye arm64 | 9650 | **2376** | 1366350 | 4850 | 7380 | - |
| [Khadas VIM3](http://ix.io/3VfL) | 2400/2015 MHz | 5.10 | Focal arm64 | 9760 | **2374** | 1365900 | 4840 | 8260 | - |
| [ODROID-N2+](http://ix.io/3R1a) | 2400/2015 MHz | 5.10 | Focal arm64 | 9680 | **2372** | 1366730 | 4030 | 7120 | - |
| [Celeron J4105](http://ix.io/1qal) | 2400/1500 MHz | 4.15 | Bionic amd64 | 9020 | **2290** | 697100 | 5500 | 7410 | 19.07 |
| [Honeycomb LX2](http://ix.io/3Y4f) | 2200 MHz | 5.16 | Fedora 35 aarch64 | 30690 | **2288** | 1251710 | 5050 | 16220 | 46.09 |
Expand Down Expand Up @@ -424,8 +424,8 @@
| [ODROID-N2+](http://ix.io/3DtN) | 2400/2015 MHz | 5.14 | Impish arm64 | 9790 | 2253 | **1366930** | 4300 | 7480 | - |
| [ODROID-N2+](http://ix.io/3R1a) | 2400/2015 MHz | 5.10 | Focal arm64 | 9680 | 2372 | **1366730** | 4030 | 7120 | - |
| [Khadas VIM3](http://ix.io/3R2Z) | 2400/2015 MHz | 5.10 | Bullseye arm64 | 9650 | 2376 | **1366350** | 4850 | 7380 | - |
| [Khadas VIM3](http://ix.io/4o1A) | 2400/2015 MHz | 6.0 | Bullseye arm64 | 9650 | 2379 | **1366300** | 5080 | 9240 | - |
| [ODROID-N2+](http://ix.io/3LoH) | 2400/2015 MHz | 5.14 | Hirsute arm64 | 9780 | 2386 | **1366090** | 4030 | 7120 | - |
| [Khadas VIM3](http://ix.io/3VfL) | 2400/2015 MHz | 5.10 | Focal arm64 | 9760 | 2374 | **1365900** | 4840 | 8260 | - |
| [Radxa ROCK 5B](http://ix.io/41BH) | 2350/1830 MHz | 5.10 | Focal arm64 | 16450 | 3146 | **1337540** | 10830 | 29220 | 25.31 |
| [Amazon a1.xlarge](http://ix.io/2iFY) | 2300 MHz | 4.15 | Bionic arm64 | 8610 | 2406 | **1297960** | 4280 | 14220 | - |
| [Khadas Edge2](http://ix.io/4a5U) | 2260/1800 MHz | 5.10 | Jammy arm64 | 16470 | 3096 | **1287490** | 10860 | 29110 | - |
Expand Down Expand Up @@ -642,11 +642,11 @@
| [Celeron J4105](http://ix.io/1qb0) | 2400/1500 MHz | 4.15 | Bionic amd64 | 8960 | 2274 | 697080 | **5620** | 7650 | 19.13 |
| [Pentium J5005](http://ix.io/21rE) | 2700/1500 MHz | 5.0 | Bionic amd64 | 9230 | 2455 | 778360 | **5530** | 7130 | 20.74 |
| [Celeron J4105](http://ix.io/1qal) | 2400/1500 MHz | 4.15 | Bionic amd64 | 9020 | 2290 | 697100 | **5500** | 7410 | 19.07 |
| [Khadas VIM3](http://ix.io/4o1A) | 2400/2015 MHz | 6.0 | Bullseye arm64 | 9650 | 2379 | 1366300 | **5080** | 9240 | - |
| [Pentium J4205](http://ix.io/1m5t) | 2560/1500 MHz | 4.17 | Stretch amd64 | 7570 | 2146 | 480640 | **5070** | 5170 | 18.82 |
| [Honeycomb LX2](http://ix.io/3Y4f) | 2200 MHz | 5.16 | Fedora 35 aarch64 | 30690 | 2288 | 1251710 | **5050** | 16220 | 46.09 |
| [Khadas VIM3](http://ix.io/1MFD) | 2200/1800 MHz | 4.9 | Bionic arm64 | 8600 | 2026 | 1256910 | **4980** | 9300 | 13.12 |
| [Khadas VIM3](http://ix.io/3R2Z) | 2400/2015 MHz | 5.10 | Bullseye arm64 | 9650 | 2376 | 1366350 | **4850** | 7380 | - |
| [Khadas VIM3](http://ix.io/3VfL) | 2400/2015 MHz | 5.10 | Focal arm64 | 9760 | 2374 | 1365900 | **4840** | 8260 | - |
| [Celeron N4100](http://ix.io/1uTS) | 2300/1100 MHz | 4.15 | Bionic amd64 | 8510 | 2222 | 669350 | **4750** | 5240 | 18.33 |
| [Pentium N4200](http://ix.io/1ngq) | 2560/1100 MHz | 4.14 | Bionic amd64 | 7469 | 1976 | 468008 | **4682** | 4997 | 18.75 |
| [Clearfog CX](http://ix.io/4ju5) | 2000 MHz | 5.10 | Focal arm64 | 25260 | 2236 | 1136690 | **4460** | 12500 | - |
Expand Down Expand Up @@ -847,6 +847,7 @@
| [HummingBoard Pulse i.MX8M Quad](http://ix.io/27FC) | 1500 MHz | 4.19 | Buster arm64 | 4330 | 1201 | 695540 | 2230 | **9900** | - |
| [Khadas VIM3](http://ix.io/1MFD) | 2200/1800 MHz | 4.9 | Bionic arm64 | 8600 | 2026 | 1256910 | 4980 | **9300** | 13.12 |
| [Celeron N5105](http://ix.io/3Qf7) | 2900/2000 MHz | 5.13 | Focal amd64 | 11450 | 3059 | 811760 | 7710 | **9290** | 21.79 |
| [Khadas VIM3](http://ix.io/4o1A) | 2400/2015 MHz | 6.0 | Bullseye arm64 | 9650 | 2379 | 1366300 | 5080 | **9240** | - |
| [ODROID-N2](http://ix.io/3MuT) | 2000/1900 MHz | 5.10 | Buster arm64 | 9090 | 2012 | 1085350 | 4260 | **9080** | - |
| [NanoPC T4](http://ix.io/1iWU) | 1800/1400 MHz | 4.17 | Stretch arm64 | 6230 | 1756 | 1023600 | 4100 | **9060** | 10.30 |
| [NanoPC T4](http://ix.io/1iZq) | 1800/1400 MHz | 4.17 | Stretch arm64 | 6380 | 1741 | 1022600 | 4160 | **9000** | 9.36 |
Expand All @@ -861,7 +862,6 @@
| [Rock Pi 4](http://ix.io/21fX) | 2000/1500 MHz | 5.3 | Bionic arm64 | 6910 | 1817 | 1147370 | 3660 | **8310** | 10.71 |
| [NanoPi M4](http://ix.io/1lzP) | 2000/1500 MHz | 4.19 | Stretch arm64 | 6400 | 1835 | 1128330 | 4080 | **8270** | 8.86 |
| [Rock Pi 4](http://ix.io/3Q2q) | 2000/1500 MHz | 5.10 | Focal arm64 | 6900 | 1899 | 1146500 | 3430 | **8260** | - |
| [Khadas VIM3](http://ix.io/3VfL) | 2400/2015 MHz | 5.10 | Focal arm64 | 9760 | 2374 | 1365900 | 4840 | **8260** | - |
| [Celeron N5100](http://ix.io/3IlQ) | 2800/1100 MHz | 5.13 | Focal amd64 | 10550 | 3088 | 783800 | 7750 | **8090** | 19.22 |
| [Quartz64](http://ix.io/3rUb) | 1810 MHz | 5.13 | Buster arm64 | 4840 | 1353 | 845490 | 2980 | **7650**| - |
| [Celeron J4105](http://ix.io/1qb0) | 2400/1500 MHz | 4.15 | Bionic amd64 | 8960 | 2274 | 697080 | 5620 | **7650** | 19.13 |
Expand Down Expand Up @@ -1042,7 +1042,7 @@
| [ODROID-N2+](http://ix.io/3R1a) | **2400/2015** MHz| 5.10 | Focal arm64 | 9680 | 2372 | 1366730 | 4030 | 7120 | - |
| [ODROID-N2+](http://ix.io/3LoH) | **2400/2015** MHz| 5.14 | Hirsute arm64 | 9780 | 2386 | 1366090 | 4030 | 7120 | - |
| [ODROID-N2+](http://ix.io/3DtN) | **2400/2015** MHz| 5.14 | Impish arm64 | 9790 | 2253 | 1366930 | 4300 | 7480 | - |
| [Khadas VIM3](http://ix.io/3VfL) | **2400/2015** MHz| 5.10 | Focal arm64 | 9760 | 2374 | 1365900 | 4840 | 8260 | - |
| [Khadas VIM3](http://ix.io/4o1A) | **2400/2015** MHz| 6.0 | Bullseye arm64 | 9650 | 2379 | 1366300 | 5080 | 9240 | - |
| [Khadas VIM3](http://ix.io/3R2Z) | **2400/2015** MHz| 5.10 | Bullseye arm64 | 9650 | 2376 | 1366350 | 4850 | 7380 | - |
| [Celeron J4105](http://ix.io/1qb0) | **2400/1500** MHz| 4.15 | Bionic amd64 | 8960 | 2274 | 697080 | 5620 | 7650 | 19.13 |
| [Celeron J4105](http://ix.io/1qal) | **2400/1500** MHz| 4.15 | Bionic amd64 | 9020 | 2290 | 697100 | 5500 | 7410 | 19.07 |
Expand Down
37 changes: 37 additions & 0 deletions results/opp-tables/rk3399-5.10.110-BSP-Radxa_ROCK_Pi_4A.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
opp-table0:
408 MHz 825.0 mV
600 MHz 825.0 mV
816 MHz 850.0 mV
1008 MHz 925.0 mV
1200 MHz 1000.0 mV
1416 MHz 1125.0 mV

opp-table1:
408 MHz 825.0 mV
600 MHz 825.0 mV
816 MHz 825.0 mV
1008 MHz 875.0 mV
1200 MHz 950.0 mV
1416 MHz 1025.0 mV
1608 MHz 1100.0 mV
1800 MHz 1200.0 mV

opp-table2:
200 MHz 825.0 mV
300 MHz 825.0 mV
400 MHz 825.0 mV
600 MHz 925.0 mV
800 MHz 1100.0 mV

opp-table3:
200 MHz 900.0 mV
300 MHz 900.0 mV
328 MHz 900.0 mV
400 MHz 900.0 mV
416 MHz 900.0 mV
528 MHz 900.0 mV
600 MHz 900.0 mV
666 MHz 900.0 mV
800 MHz 900.0 mV
856 MHz 900.0 mV
928 MHz 900.0 mV
Binary file modified results/results.tar.xz
Binary file not shown.
3 changes: 2 additions & 1 deletion results/validation.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
| [3Ug9](3Ug9.txt) | v0.9.3 Hardkernel ODROID-M1 | 0%/0% | 7.3Gi/7.0Gi | X | X | X | X | 2% | 0% | |
| [3VME](3VME.txt) | v0.9.3 RPi 4 Model B Rev 1.1 / BCM2711 | 1.9%/0.2% | 967Mi/807Mi | X | X | X | X | <span style=color:red>**12%**</span> | 0% | |
| [3Vdt](3Vdt.txt) | v0.9.3 Khadas VIM3L | 0%/0% | 1.8Gi/1.1Gi | X | X | X | X | 4% | 3% | |
| [3VfL](3VfL.txt) | v0.9.3 Khadas VIM3 | 0%/0.2% | 3.7Gi/2.7Gi | X | X | X | X | 1% | 0% | |
| <del>[3VfL](3VfL.txt)</del> | <del>v0.9.3 Khadas VIM3 </del> | <del>0%/0.2%</del> | <del>3.7Gi/2.7Gi</del> | <del>X</del> | <del>X</del> | <del>X</del> | <del>X</del> | <del> 1%</del> | <del> 0%</del> | |
| <del>[3Wq0](3Wq0.txt)</del> | <del>v0.9.3 Khadas VIM4 </del> | <del>0%/0.3%</del> | <del>7.8Gi/6.0Gi</del> | <del>X</del> | <del>X</del> | <del>X</del> | <del>X</del> | <del> 2%</del> | <del> 0%</del> | |
| [3Wvv](3Wvv.txt) | v0.9.4 Khadas VIM4 | 0%/0.2% | 7.8Gi/6.6Gi | X | X | X | X | 2% | 0% | |
| [3X9q](3X9q.txt) | v0.9.4 Rockchip RK3288 Asus Tinker Boar | 0.3%/0.2% | 2.0Gi/1.8Gi | X | X | X | X | 2% | 0% | |
Expand Down Expand Up @@ -240,3 +240,4 @@
| [4knR](4knR.txt) | v0.9.9 Allwinner D1 Nezha | 8.3%/6.1% | 980Mi/859Mi | X | X | X | X | <span style=color:red> 9%</span> | 2% | [check log](4knR.txt) |
| [4kor](4kor.txt) | v0.9.9 Rockchip RK3318 BOX | 0%/2.1% | 1.9Gi/1.4Gi | X | X | X | X | 2% | 0% | |
| [4nt8](4nt8.txt) | v0.9.13 Beijin Cloud Times S13XS / Atom | 0.2%/0.2% | 3.8Gi/3.5Gi | X | X | X | X | 2% | 0% | |
| [4o1A](4o1A.txt) | v0.9.19 Khadas VIM3 | 0%/0% | 3.7Gi/3.5Gi | X | X | X | X | 1% | 0% | |
55 changes: 47 additions & 8 deletions sbc-bench.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

Version=0.9.19
Version=0.9.20
InstallLocation=/usr/local/src # change to /tmp if you want tools to be deleted after reboot

Main() {
Expand Down Expand Up @@ -164,7 +164,7 @@ Main() {
# The last 2 arguments are optional: sleep time (defaults to 0.8) and
# count of samples (defaults to 30). The defaults already put significant
# load on the device (compare http://ix.io/3E91 and http://ix.io/3Ebd) so
# to monitor idle consumption better choose 5 and 30 and deal with a 150
# to monitor idle consumption better choose 4.8 and 30 and deal with a 150
# seconds average value.
MonitorNetio "$2" "$3" "$4" "$5" "$6"
exit 0
Expand Down Expand Up @@ -2755,7 +2755,7 @@ GetInputVoltage() {
in_voltage2_raw)
case "${DTCompatible}" in
*nanopi-r6s*)
# NaniPi R6S running with Rockchip's 5.10 BSP kernel
# NanoPi R6S running with Rockchip's 5.10 BSP kernel
awk '{printf ("%0.2f",$1/206.2); }' <"${1}" | sed 's/,/./'
;;
esac
Expand Down Expand Up @@ -3052,7 +3052,11 @@ RunTinyMemBench() {

echo -e "Executing tinymembench...\c"
echo -e "System health while running tinymembench:\n" >${MonitorLog}
/bin/bash "${PathToMe}" -m $(( 40 * ${#ClusterConfig[@]} )) >>${MonitorLog} &
if [ "X${MODE}" = "Xextensive" ]; then
/bin/bash "${PathToMe}" -m $(( 40 * ${#ClusterConfig[@]} )) >>${MonitorLog} &
else
/bin/bash "${PathToMe}" -m $(( 10 * ${#ClusterConfig[@]} )) >>${MonitorLog} &
fi
MonitoringPID=$!
echo -n "" >${TempLog}
for i in $(seq 0 $(( ${#ClusterConfig[@]} -1 )) ) ; do
Expand Down Expand Up @@ -3277,8 +3281,16 @@ RunCpuminerBenchmark() {
kill ${MinerPID} ${MonitoringPID}
echo -e "\n##########################################################################\n" >>${ResultLog}
sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" <${TempLog} >>${ResultLog}
# Summarized 'Total:' scores
TotalScores="$(awk -F" " '/Total:/ {print $4}' ${TempLog} | sort -r -n | uniq | tr '\n' ', ' | sed 's/,$//')"
# Summarized 'Total:' scores, we need to skip the 1st or even better the two first since
# sometimes significantly lower which could then be misinterpreted as silent throttling
MinerRuns=$(grep -c " Total:" ${TempLog})
if [ ${MinerRuns:-0} -ge 10 ]; then
# skip two first scores when more than 10 cpuminer scores could be generated
TotalScores="$(awk -F" " '/Total:/ {print $4}' ${TempLog} | tail -n +3 | sort -r -n | uniq | tr '\n' ', ' | sed 's/,$//')"
else
# skip only 1st score
TotalScores="$(awk -F" " '/Total:/ {print $4}' ${TempLog} | tail -n +2 | sort -r -n | uniq | tr '\n' ', ' | sed 's/,$//')"
fi
echo -e "\nTotal Scores: ${TotalScores}" >>${ResultLog}
CpuminerScore="$(awk -F"," '{print $2}' <<<"${TotalScores}")"
} # RunCpuminerBenchmark
Expand Down Expand Up @@ -4357,7 +4369,7 @@ GuessARMSoC() {
AmlogicGuess="Amlogic Meson$(grep -i " detected$" <<<"${DMESG}" | awk -F"Amlogic Meson" '/Amlogic Meson/ {print $2}' | head -n1)"
AMLS4Guess="$(awk -F"= " '/cpu_version: chip version/ {print $2}' <<<"${DMESG}")"

if [ "X${RockchipGuess}" != "X" ]; then
if [ "X${RockchipGuess}" != "X" -a "X${RockchipGuess}" != "X0" ]; then
echo "Rockchip RK$(cut -c-4 <<<"${RockchipGuess}") (${RockchipGuess})" | sed 's| RK3588 | RK3588/RK3588s |'
elif [ "X${AmlogicGuess}" != "XAmlogic Meson" ]; then
echo "${AmlogicGuess}" | sed -e 's/GXL (Unknown) Revision 21:b (2:2)/GXL (S905D) Revision 21:b (2:2)/' \
Expand Down Expand Up @@ -6208,6 +6220,21 @@ ProvideReviewInfo() {
;;
esac

# throttling check and routine waiting for the board to cool down since otherwise the
# next monitoring step will report throttling even if none happens from now on.
if [ -r /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq ]; then
cpuinfo_max_freq=$(cat /sys/devices/system/cpu/cpu?/cpufreq/cpuinfo_max_freq)
cpuinfo_cur_freq=$(cat /sys/devices/system/cpu/cpu?/cpufreq/cpuinfo_cur_freq)
[ "X${cpuinfo_max_freq}" != "X${cpuinfo_cur_freq}" ] && echo -e "\nWaiting for the device to cool down: \c"
while [ "X${cpuinfo_max_freq}" != "X${cpuinfo_cur_freq}" ]; do
TempNow=$(ReadSoCTemp)
echo -e "\x08\x08\x08\x08\x08 ${TempNow}°C\c"
sleep 2
cpuinfo_max_freq=$(cat /sys/devices/system/cpu/cpu?/cpufreq/cpuinfo_max_freq)
cpuinfo_cur_freq=$(cat /sys/devices/system/cpu/cpu?/cpufreq/cpuinfo_cur_freq)
done
fi

# device now ready for benchmarking
cat <<- EOF
Expand All @@ -6216,10 +6243,21 @@ ProvideReviewInfo() {
and too high background activity all potentially invalidating benchmark scores.
EOF

# Now switch to monitoring mode, report consumption if Netio powermeter is available
if [ -n "${OutputCurrent}" ]; then
# We are in Netio monitoring mode
NetioConsumptionFile="${TempDir}/netio.current"
echo -n $(( $(awk '{printf ("%0.0f",$1/10); }' <<<"${OutputCurrent[$(( ${NetioSocket} - 1 ))]}" ) * 10 )) >"${NetioConsumptionFile}"
export NetioConsumptionFile
/bin/bash "${PathToMe}" -N ${NetioDevice} ${NetioSocket} ${NetioConsumptionFile} "4.8" "30" >/dev/null 2>&1 &
NetioMonitoringPID=$!
fi

trap "FinalReporting ; exit 0" 0 1 2 3 15
rm "${TempDir}"/*time_in_state*
CheckTimeInState before
/bin/bash "${PathToMe}" -m 60 >"${TempDir}/review" &
MonitoringPID=$!
echo ""
sleep 1
tail -f "${TempDir}/review"
Expand All @@ -6228,6 +6266,7 @@ ProvideReviewInfo() {
FinalReporting() {
trap "rm -rf \"${TempDir}\" ; exit 0" 0 1 2 3 15
echo -e "\n\nCleaning up...\c"
kill ${NetioMonitoringPID} ${MonitoringPID} 2>/dev/null
CheckTimeInState after
CheckClockspeedsAndSensors
ClockspeedsNow="$(cat "${TempDir}/cpufreq" | sed -e 's/^/ /')"
Expand Down Expand Up @@ -6317,7 +6356,7 @@ CheckKernelVersion() {
echo -e "${LRED}${BOLD}Please check https://endoflife.date/linux for details. It is somewhat likely${NC}"
echo -e "${LRED}${BOLD}that some exploitable vulnerabilities exist for this kernel as well as many${NC}"
echo -e "${LRED}${BOLD}unfixed bugs. Better upgrade to a supported version.${NC}"
elif [ ${RevisionDifference} -ge 5 ]; then
elif [ ${RevisionDifference} -gt 5 ]; then
echo -e "${LRED}${BOLD}Please check https://endoflife.date/linux for details. It is somewhat likely${NC}"
echo -e "${LRED}${BOLD}some kernel bugs have been fixed in the meantime and maybe vulnerabilities${NC}"
echo -e "${LRED}${BOLD}as well.${NC}"
Expand Down

0 comments on commit de3cd42

Please sign in to comment.