Turbostat: remove unused variable has_epb

[collectd.git] / src / turbostat.c

diff --git a/src/turbostat.c b/src/turbostat.c
index 9337e90..52e60f3 100644 (file)
--- a/src/turbostat.c
+++ b/src/turbostat.c
@@ -67,16 +67,9 @@ static unsigned int do_nhm_cstates;
 static unsigned int do_snb_cstates;
 static unsigned int do_c8_c9_c10;
 static unsigned int do_slm_cstates;
-static unsigned int has_aperf;
-static unsigned int has_epb;
-static unsigned int units = 1000000000;        /* Ghz etc */
 static unsigned int genuine_intel;
-static unsigned int has_invariant_tsc;
 static unsigned int do_nehalem_platform_info;
 static int do_smi;
-static unsigned int show_pkg;
-static unsigned int show_core;
-static unsigned int show_cpu;
 static unsigned int do_rapl;
 static unsigned int do_dts;
 static unsigned int do_ptm;
@@ -450,12 +443,10 @@ get_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p)
 
        t->tsc = rdtsc();       /* we are running on local CPU of interest */
 
-       if (has_aperf) {
-               if (get_msr(cpu, MSR_IA32_APERF, &t->aperf))
-                       return -ERR_MSR_IA32_APERF;
-               if (get_msr(cpu, MSR_IA32_MPERF, &t->mperf))
-                       return -ERR_MSR_IA32_MPERF;
-       }
+       if (get_msr(cpu, MSR_IA32_APERF, &t->aperf))
+               return -ERR_MSR_IA32_APERF;
+       if (get_msr(cpu, MSR_IA32_MPERF, &t->mperf))
+               return -ERR_MSR_IA32_MPERF;
 
        if (do_smi) {
                if (get_msr(cpu, MSR_SMI_COUNT, &msr))
@@ -833,8 +824,8 @@ submit_counters(struct thread_data *t, struct core_data *c,
        }
 
        /* GHz */
-       if (has_aperf && ((!aperf_mperf_unstable) || (!(t->aperf > t->tsc || t->mperf > t->tsc))))
-               turbostat_submit(NULL, "frequency", name, 1.0 * t->tsc / units * t->aperf / t->mperf / interval_float);
+       if ((!aperf_mperf_unstable) || (!(t->aperf > t->tsc || t->mperf > t->tsc)))
+               turbostat_submit(NULL, "frequency", name, 1.0 * t->tsc / 1000000000 * t->aperf / t->mperf / interval_float);
 
        /* SMI */
        if (do_smi)
@@ -1210,9 +1201,7 @@ check_cpuid()
         * this check is valid for both Intel and AMD
         */
        __get_cpuid(0x80000007, &eax, &ebx, &ecx, &edx);
-       has_invariant_tsc = edx & (1 << 8);
-
-       if (!has_invariant_tsc) {
+       if (!(edx & (1 << 8))) {
                ERROR("No invariant TSC");
                return -ERR_NO_INVARIANT_TSC;
        }
@@ -1223,17 +1212,14 @@ check_cpuid()
         */
 
        __get_cpuid(0x6, &eax, &ebx, &ecx, &edx);
-       has_aperf = ecx & (1 << 0);
        do_dts = eax & (1 << 0);
        do_ptm = eax & (1 << 6);
-       has_epb = ecx & (1 << 3);
-
-       if (!has_aperf) {
+       if (!(ecx & (1 << 0))) {
                ERROR("No APERF");
                return -ERR_NO_APERF;
        }
 
-       do_nehalem_platform_info = genuine_intel && has_invariant_tsc;
+   do_nehalem_platform_info = genuine_intel;
        do_nhm_cstates = genuine_intel; /* all Intel w/ non-stop TSC have NHM counters */
        do_smi = do_nhm_cstates;
        do_snb_cstates = is_snb(family, model);
@@ -1266,8 +1252,6 @@ topology_probe()
        ret = for_all_proc_cpus(count_cpus);
        if (ret < 0)
                return ret;
-       if (topo.num_cpus > 1)
-               show_cpu = 1;
 
        DEBUG("num_cpus %d max_cpu_num %d\n", topo.num_cpus, topo.max_cpu_num);
 
@@ -1342,14 +1326,10 @@ topology_probe()
        topo.num_cores_per_pkg = max_core_id + 1;
        DEBUG("max_core_id %d, sizing for %d cores per package\n",
                max_core_id, topo.num_cores_per_pkg);
-       if (topo.num_cores_per_pkg > 1)
-               show_core = 1;
 
        topo.num_packages = max_package_id + 1;
        DEBUG("max_package_id %d, sizing for %d packages\n",
                max_package_id, topo.num_packages);
-       if (topo.num_packages > 1)
-               show_pkg = 1;
 
        topo.num_threads_per_core = max_siblings;
        DEBUG("max_siblings %d\n", max_siblings);