X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fturbostat.c;h=85f7d87f62f977de6b49a5031928e557adae0f4b;hp=e4419b85689ea5003d06b799ec37982abcecfa88;hb=a9e50e9e30ecde17e167e271060c8183bfcbf407;hpb=df6a1dedda953cb34fc4d16d390c823021d0916d diff --git a/src/turbostat.c b/src/turbostat.c index e4419b85..85f7d87f 100644 --- a/src/turbostat.c +++ b/src/turbostat.c @@ -586,7 +586,8 @@ static int submit_counters(struct thread_data *t, struct core_data *c, /* If not using logical core numbering, set core id */ if (!config_lcn) { if (topology.num_packages > 1) - snprintf(name, sizeof(name), "pkg%02d-core%02d", p->package_id, c->core_id); + snprintf(name, sizeof(name), "pkg%02d-core%02d", p->package_id, + c->core_id); else snprintf(name, sizeof(name), "core%02d", c->core_id); } @@ -977,6 +978,7 @@ static int __attribute__((warn_unused_result)) probe_cpu(void) { case 0x45: /* HSW */ case 0x46: /* HSW */ case 0x3D: /* BDW */ + case 0x5E: /* SKL */ do_rapl = RAPL_PKG | RAPL_CORES | RAPL_GFX; break; case 0x3F: /* HSX */