v6.17

+ Add cpu temps to results: https://github.com/Fourdee/DietPi/issues/1927
MichaIng · Sep 30, 2018 · 02da1a8 · 02da1a8
1 parent 7426491
commit 02da1a8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/dietpi/dietpi-survey b/dietpi/dietpi-survey
@@ -119,6 +119,8 @@ BENCH_ROOTFS_WRITE=$(sed -n 2p /var/lib/dietpi/dietpi-benchmark/upload_results)
 BENCH_ROOTFS_READ=$(sed -n 3p /var/lib/dietpi/dietpi-benchmark/upload_results)
 BENCH_RAM_WRITE=$(sed -n 4p /var/lib/dietpi/dietpi-benchmark/upload_results)
 BENCH_RAM_READ=$(sed -n 5p /var/lib/dietpi/dietpi-benchmark/upload_results)
+BENCH_CPU_TEMP_START=$(sed -n 6p /var/lib/dietpi/dietpi-benchmark/upload_results)
+BENCH_CPU_TEMP_END=$(sed -n 7p /var/lib/dietpi/dietpi-benchmark/upload_results)
 _EOF_
 
 		fi

diff --git a/dietpi/func/dietpi-benchmark b/dietpi/func/dietpi-benchmark
@@ -35,6 +35,8 @@
 
 	CPUBENCH_TIME='Not tested'
 	CPUBENCH_INT_MAX=${CPUBENCH_INT_MAX:-1000000} #optional input
+	BENCH_CPU_TEMP_START=0
+	BENCH_CPU_TEMP_END=0
 	CPU_Benchmark(){
 
 		G_DIETPI-NOTIFY 0 "Running DietPi-CPU Benchmark with max value of 1000000 over $(nproc --all) cores, please wait..."
@@ -96,16 +98,20 @@ _EOF_
 		sync
 		sleep 1
 
+		BENCH_CPU_TEMP_START=$(G_OBTAIN_CPU_TEMP)
+
 		{ time -p $FP_TEMP/bench; } 2> $FP_TEMP/bench_result
 
+		BENCH_CPU_TEMP_END=$(G_OBTAIN_CPU_TEMP)
 		CPUBENCH_TIME=$( grep -m1 'real' $FP_TEMP/bench_result | awk '{print $2}' )
 
 		if (( $SHOW_RESULTS )); then
 
 			G_WHIP_MSG "CPU Benchmark Results:\n
  - Total time     = $CPUBENCH_TIME Seconds
- - Value to reach = $CPUBENCH_INT_MAX\n\n
- NB: A lower 'Total time' is faster"
+ - Value to reach = $CPUBENCH_INT_MAX
+ - CPU temps      = Start: ${BENCH_CPU_TEMP_START}'c | End: ${BENCH_CPU_TEMP_END}'c\n\n
+NB: A lower 'Total time' is faster"
 
 		fi
 
@@ -226,14 +232,17 @@ $rootfs_write
 $rootfs_read
 $ram_write
 $ram_read
+$BENCH_CPU_TEMP_START
+$BENCH_CPU_TEMP_END
 _EOF_
 
 		#SHOW_RESULTS=1
 
 		G_WHIP_MSG "Benchmarks completed:
-CPU     : Total time $CPUBENCH_INT_MAX int = $CPUBENCH_TIME seconds
-RAM     : Write = $ram_write MB/s | Read = $ram_read MB/s
-RootFS  : Write = $rootfs_write MB/s | Read = $rootfs_read MB/s"
+CPU       : Total time $CPUBENCH_INT_MAX int = $CPUBENCH_TIME seconds
+RAM       : Write = $ram_write MB/s | Read = $ram_read MB/s
+RootFS    : Write = $rootfs_write MB/s | Read = $rootfs_read MB/s
+CPU temp  : Start = ${BENCH_CPU_TEMP_START}'c | End = ${BENCH_CPU_TEMP_END}'c"
 
 		# - Upload
 		/DietPi/dietpi/dietpi-survey 1