Commit 25e713c6 authored by Patryk Wlazlyn's avatar Patryk Wlazlyn Committed by Len Brown
Browse files

tools/power turbostat: Add ZERO_ARRAY for zero initializing builtin array 



It makes it harder to shoot yourself in the foot, by using
additional __must_be_array() check.

Signed-off-by: default avatarPatryk Wlazlyn <patryk.wlazlyn@linux.intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 73ed3c94

tools/power/x86/turbostat/turbostat.c

+5 −3
Original line number Diff line number Diff line
@@ -1060,6 +1060,8 @@ size_t cpu_present_setsize, cpu_effective_setsize, cpu_allowed_setsize, cpu_affi 
#define MAX_ADDED_PACKAGE_COUNTERS 16

#define BITMASK_SIZE 32



#define ZERO_ARRAY(arr) (memset(arr, 0, sizeof(arr)) + __must_be_array(arr))



/* Indexes used to map data read from perf and MSRs into global variables */

enum rapl_rci_index {

	RAPL_RCI_INDEX_ENERGY_PKG = 0,
@@ -3733,9 +3735,9 @@ int get_cstate_counters(unsigned int cpu, struct thread_data *t, struct core_dat 
	assert(ccstate_counter_info);

	assert(cpu <= ccstate_counter_info_size);



	memset(perf_data, 0, sizeof(perf_data));

	memset(perf_data_core, 0, sizeof(perf_data_core));

	memset(perf_data_pkg, 0, sizeof(perf_data_pkg));

	ZERO_ARRAY(perf_data);

	ZERO_ARRAY(perf_data_core);

	ZERO_ARRAY(perf_data_pkg);



	cci = &ccstate_counter_info[cpu];