X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fturbostat.c;h=fc1b5dccc0dd3c4b2c2c848b1de1f9a57c95c156;hb=49ac868d2346c77335272b8a643bca295db9feaa;hp=e17e0c2cd31f5b3b1b00624be3d4657a7e400e12;hpb=de9c9528a08ce9e571e6742810cc7c3e6eb87aef;p=collectd.git diff --git a/src/turbostat.c b/src/turbostat.c index e17e0c2c..fc1b5dcc 100644 --- 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) {