Commit fdea5c6d authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

scripts/perf/pm: Add $TEST_TAG to collect-bmc-pm's output 



As we are at it, align some printouts and redirect them to stderr
as initially intended.

Change-Id: I3c26240bd72ad3ebecba657a8f6b8865f96c4a00
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21536


Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent d5fe62b2

scripts/perf/pm/collect-bmc-pm

+12 −8
Original line number Diff line number Diff line
@@ -287,12 +287,13 @@ get_dcmi_now_reading() { 


		for print in min max avg reading; do

			[[ -n ${!print} ]] || continue

			printf '(%s) DCMI %s (mode: %s): %u Watts (interval: %ss)\n' \

			printf '(%s) DCMI %s (mode: %s): %u Watts (interval: %ss, test: %s)\n' \

				"$(utc "$ts")" \

				"$print" \

				"$mode" \

				"${!print}" \

				"$interval"

				"$interval" \

				"$TEST_TAG" >&2

		done

	fi >&2

}
@@ -314,11 +315,12 @@ get_sdr_now_reading() { 
			power_readings["${power_sensors[sensor]}"]="_sensor${sensor}_readings[@]"

			reading+=" $unit"

		fi < <("$ipmitool" -c -S "$sdr_cache" sdr get "${power_sensors[sensor]}") 2> /dev/null

		printf '(%s) Sensor %s reading: %s (interval %ss)\n' \

		printf '(%s) Sensor %s reading: %s (interval: %ss, test: %s)\n' \

			"$ts" \

			"${power_sensors[sensor]}" \

			"$reading" \

			"$interval" >&2

			"$interval" \

			"$TEST_TAG" >&2

	done

}
@@ -357,23 +359,25 @@ get_cpu_socket_reading() { 
			# Somehow this may happen, probably when the counter wraps over. Consider

			# this as a faulty reading and don't include it since it may impact overall

			# avg.

			printf '(%s) CPU %s %s reading: error(%s) (interval: %ss)\n' \

			printf '(%s) CPU %s %s reading: error(%s) (interval: %ss, test: %s)\n' \

				"$ts" \

				"$socket_name" \

				"$socket_idx" \

				"$reading" \

				"$interval" >&2

				"$interval" \

				"$TEST_TAG" >&2

			return 0

		fi

		eval "_socket${_socket_idx}_readings+=($reading)"

		power_readings["$socket_name-$socket_idx"]="_socket${_socket_idx}_readings[@]"



		printf '(%s) CPU %s %s reading: %s Watts (interval: %ss)\n' \

		printf '(%s) CPU %s %s reading: %s Watts (interval: %ss, test: %s)\n' \

			"$ts" \

			"$socket_name" \

			"$socket_idx" \

			"$reading" \

			"$interval" >&2

			"$interval" \

			"$TEST_TAG" >&2

	done

}