X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fturbostat.c;h=c242b6eeb67db6e30ee2a4a97d306b3fdd8107c5;hb=77ad300d75ce59bf4d49d839a2af72e90590033c;hp=31321490309d7a63c0fb449e0944e3b1b835042c;hpb=92860d61218a3da1e9b74a2fad37e9df88df8ce8;p=collectd.git

diff --git a/src/turbostat.c b/src/turbostat.c
index 31321490..c242b6ee 100644
--- a/src/turbostat.c
+++ b/src/turbostat.c
@@ -65,6 +65,11 @@
 static _Bool aperf_mperf_unstable;
 
 /*
+ * If set, use kernel logical core numbering for all "per core" metrics.
+ */
+static _Bool config_lcn;
+
+/*
  * Bitmask of the list of core C states supported by the processor.
  * Currently supported C-states (by this plugin): 3, 6, 7
  */
@@ -225,6 +230,7 @@ static const char *config_keys[] =
 	"PackageThermalManagement",
 	"TCCActivationTemp",
 	"RunningAveragePowerLimit",
+	"LogicalCoreNames",
 };
 static const int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
@@ -551,6 +557,9 @@ submit_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p)
 
 	interval_float = CDTIME_T_TO_DOUBLE(time_delta);
 
+	DEBUG("turbostat plugin: submit stats for cpu: %d, core: %d, pkg: %d",
+		t->cpu_id, c->core_id, p->package_id);
+
 	ssnprintf(name, sizeof(name), "cpu%02d", t->cpu_id);
 
 	if (!aperf_mperf_unstable)
@@ -574,7 +583,10 @@ submit_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p)
 	if (!(t->flags & CPU_IS_FIRST_THREAD_IN_CORE))
 		goto done;
 
-	ssnprintf(name, sizeof(name), "core%02d", c->core_id);
+	/* If not using logical core numbering, set core id */
+	if (!config_lcn) {
+		ssnprintf(name, sizeof(name), "core%02d", c->core_id);
+	}
 
 	if (do_core_cstate & (1 << 3))
 		turbostat_submit(name, "percent", "c3", 100.0 * c->c3/t->tsc);
@@ -1566,6 +1578,8 @@ turbostat_config(const char *key, const char *value)
 	} else if (strcasecmp("PackageThermalManagement", key) == 0) {
 		config_ptm = IS_TRUE(value);
 		apply_config_ptm = 1;
+	} else if (strcasecmp("LogicalCoreNames", key) == 0) {
+		config_lcn = IS_TRUE(value);
 	} else if (strcasecmp("RunningAveragePowerLimit", key) == 0) {
 		tmp_val = strtoul(value, &end, 0);
 		if (*end != '\0' || tmp_val > UINT_MAX) {