diff options
| author | Mika Westerberg <mika.westerberg@linux.intel.com> | 2016-04-22 11:13:23 +0300 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2016-12-01 01:33:16 -0500 |
| commit | 01a67adfc5d73d24e999d9cf65b5b8a6687187b8 (patch) | |
| tree | 810e3a6680f4cbe8db0c77383af18f352aca14b5 /tools | |
| parent | 3d109de23c93e9196c370fd729fbd7ecf7371701 (diff) | |
| download | linux-stable-01a67adfc5d73d24e999d9cf65b5b8a6687187b8.tar.gz linux-stable-01a67adfc5d73d24e999d9cf65b5b8a6687187b8.tar.bz2 linux-stable-01a67adfc5d73d24e999d9cf65b5b8a6687187b8.zip | |
tools/power turbostat: Allocate correct amount of fd and irq entries
The tool uses topo.max_cpu_num to determine number of entries needed for
fd_percpu[] and irqs_per_cpu[]. For example on a system with 4 CPUs
topo.max_cpu_num is 3 so we get too small array for holding per-CPU items.
Fix this to use right number of entries, which is topo.max_cpu_num + 1.
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/power/x86/turbostat/turbostat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index be50892f27aa..741fefa2f07e 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -1618,7 +1618,7 @@ void free_fd_percpu(void) { int i; - for (i = 0; i < topo.max_cpu_num; ++i) { + for (i = 0; i < topo.max_cpu_num + 1; ++i) { if (fd_percpu[i] != 0) close(fd_percpu[i]); } @@ -3584,7 +3584,7 @@ void allocate_output_buffer() } void allocate_fd_percpu(void) { - fd_percpu = calloc(topo.max_cpu_num, sizeof(int)); + fd_percpu = calloc(topo.max_cpu_num + 1, sizeof(int)); if (fd_percpu == NULL) err(-1, "calloc fd_percpu"); } @@ -3594,9 +3594,9 @@ void allocate_irq_buffers(void) if (irq_column_2_cpu == NULL) err(-1, "calloc %d", topo.num_cpus); - irqs_per_cpu = calloc(topo.max_cpu_num, sizeof(int)); + irqs_per_cpu = calloc(topo.max_cpu_num + 1, sizeof(int)); if (irqs_per_cpu == NULL) - err(-1, "calloc %d", topo.max_cpu_num); + err(-1, "calloc %d", topo.max_cpu_num + 1); } void setup_all_buffers(void) { |