Commit db735f8b authored by Zhang Rui's avatar Zhang Rui
Browse files

tools/power/turbostat: Relocate thermal probing code 



Introduce probe_thermal(), and move all thermal probing related code
into it.

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Reviewed-by: default avatarLen Brown <len.brown@intel.com>
parent e7d7b82d

tools/power/x86/turbostat/turbostat.c

+10 −5
Original line number Diff line number Diff line
@@ -4894,6 +4894,14 @@ void probe_rapl(void) 
		rapl_probe_amd();

}



void probe_thermal(void)

{

	if (!access("/sys/devices/system/cpu/cpu0/thermal_throttle/core_throttle_count", R_OK))

		BIC_PRESENT(BIC_CORE_THROT_CNT);

	else

		BIC_NOT_PRESENT(BIC_CORE_THROT_CNT);

}



int print_thermal(struct thread_data *t, struct core_data *c, struct pkg_data *p)

{

	unsigned long long msr;
@@ -5598,14 +5606,11 @@ void process_cpuid() 


	probe_rapl();



	probe_thermal();



	if (platform->has_nhm_msrs)

		BIC_PRESENT(BIC_SMI);



	if (!access("/sys/devices/system/cpu/cpu0/thermal_throttle/core_throttle_count", R_OK))

		BIC_PRESENT(BIC_CORE_THROT_CNT);

	else

		BIC_NOT_PRESENT(BIC_CORE_THROT_CNT);



	if (!quiet)

		decode_misc_feature_control();