author | Ruben Kerkhof <ruben@tilaa.nl> | |
Fri, 4 Mar 2016 11:15:31 +0000 (12:15 +0100) | ||
committer | Ruben Kerkhof <ruben@tilaa.nl> | |
Fri, 4 Mar 2016 11:15:31 +0000 (12:15 +0100) |
Turbostat: fix shadowing issue
src/turbostat.c | patch | blob | history |
diff --git a/src/turbostat.c b/src/turbostat.c
index 14ce29fdb20c0ef9d40ddda2ea48af88ea6da991..7784e9b915ed5903d715a7d426b1a49a155f4b24 100644 (file)
--- a/src/turbostat.c
+++ b/src/turbostat.c
@@ -457,7 +457,7 @@ delta_core(struct core_data *delta, const struct core_data *new, const struct co
*/
static inline int __attribute__((warn_unused_result))
delta_thread(struct thread_data *delta, const struct thread_data *new, const struct thread_data *old,
- const struct core_data *core_delta)
+ const struct core_data *cdelta)
{
delta->tsc = new->tsc - old->tsc;
@@ -491,12 +491,12 @@ delta_thread(struct thread_data *delta, const struct thread_data *new, const str
* it is possible for mperf's non-halted cycles + idle states
* to exceed TSC's all cycles: show c1 = 0% in that case.
*/
- if ((delta->mperf + core_delta->c3 + core_delta->c6 + core_delta->c7) > delta->tsc)
+ if ((delta->mperf + cdelta->c3 + cdelta->c6 + cdelta->c7) > delta->tsc)
delta->c1 = 0;
else {
/* normal case, derive c1 */
- delta->c1 = delta->tsc - delta->mperf - core_delta->c3
- - core_delta->c6 - core_delta->c7;
+ delta->c1 = delta->tsc - delta->mperf - cdelta->c3
+ - cdelta->c6 - cdelta->c7;
}
if (delta->mperf == 0) {