X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fturbostat.c;h=42fed52a3e496b8e87036f20150023ce50a56ff2;hb=45e631cf6134de4a5dd3bcf01794c9fdd539c412;hp=1cbe8fdcfa096d03efbbbd52e717ca3f83cc46c9;hpb=5fabca96e9bf4a8c5bf0e721b831b1bc00ba35d1;p=collectd.git

diff --git a/src/turbostat.c b/src/turbostat.c
index 1cbe8fdc..42fed52a 100644
--- a/src/turbostat.c
+++ b/src/turbostat.c
@@ -560,17 +560,17 @@ submit_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p)
 	if (!aperf_mperf_unstable)
 		turbostat_submit(name, "percent", "c1", 100.0 * t->c1/t->tsc);
 
-	turbostat_submit("Average", "frequency", name, 1.0 / 1000000 * t->aperf / interval_float);
+	turbostat_submit(name, "frequency", "average", 1.0 / 1000000 * t->aperf / interval_float);
 
 	if ((!aperf_mperf_unstable) || (!(t->aperf > t->tsc || t->mperf > t->tsc)))
-		turbostat_submit("Buzy", "frequency", name, 1.0 * t->tsc / 1000000 * t->aperf / t->mperf / interval_float);
+		turbostat_submit(name, "frequency", "busy", 1.0 * t->tsc / 1000000 * t->aperf / t->mperf / interval_float);
 
 	/* Sanity check (should stay stable) */
-	turbostat_submit("TSC", "gauge", name, 1.0 * t->tsc / 1000000 / interval_float);
+	turbostat_submit(name, "gauge", "TSC", 1.0 * t->tsc / 1000000 / interval_float);
 
 	/* SMI */
 	if (do_smi)
-		turbostat_submit(NULL, "current", name, t->smi_count);
+		turbostat_submit(name, "count", NULL, t->smi_count);
 
 	/* submit per-core data only for 1st thread in core */
 	if (!(t->flags & CPU_IS_FIRST_THREAD_IN_CORE))
@@ -586,7 +586,7 @@ submit_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p)
 		turbostat_submit(name, "percent", "c7", 100.0 * c->c7/t->tsc);
 
 	if (do_dts)
-		turbostat_submit(NULL, "temperature", name, c->core_temp_c);
+		turbostat_submit(name, "temperature", NULL, c->core_temp_c);
 
 	/* submit per-package data only for 1st core in package */
 	if (!(t->flags & CPU_IS_FIRST_CORE_IN_PACKAGE))
@@ -595,7 +595,7 @@ submit_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p)
 	ssnprintf(name, sizeof(name), "pkg%02d", p->package_id);
 
 	if (do_ptm)
-		turbostat_submit(NULL, "temperature", name, p->pkg_temp_c);
+		turbostat_submit(name, "temperature", NULL, p->pkg_temp_c);
 
 	if (do_pkg_cstate & (1 << 2))
 		turbostat_submit(name, "percent", "pc2", 100.0 * p->pc2/t->tsc);
@@ -614,13 +614,13 @@ submit_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p)
 
 	if (do_rapl) {
 		if (do_rapl & RAPL_PKG)
-			turbostat_submit(name, "power", "Pkg_W", p->energy_pkg * rapl_energy_units / interval_float);
+			turbostat_submit(name, "power", "pkg", p->energy_pkg * rapl_energy_units / interval_float);
 		if (do_rapl & RAPL_CORES)
-			turbostat_submit(name, "power", "Cor_W", p->energy_cores * rapl_energy_units / interval_float);
+			turbostat_submit(name, "power", "cores", p->energy_cores * rapl_energy_units / interval_float);
 		if (do_rapl & RAPL_GFX)
-			turbostat_submit(name, "power", "GFX_W", p->energy_gfx * rapl_energy_units / interval_float);
+			turbostat_submit(name, "power", "GFX", p->energy_gfx * rapl_energy_units / interval_float);
 		if (do_rapl & RAPL_DRAM)
-			turbostat_submit(name, "power", "RAM_W", p->energy_dram * rapl_energy_units / interval_float);
+			turbostat_submit(name, "power", "DRAM", p->energy_dram * rapl_energy_units / interval_float);
 	}
 done:
 	return 0;
@@ -1253,10 +1253,22 @@ allocate_counters(struct thread_data **threads, struct core_data **cores, struct
 	unsigned int i;
 	unsigned int total_threads, total_cores;
 
+	if ((topology.num_threads == 0)
+	    || (topology.num_cores == 0)
+	    || (topology.num_packages == 0))
+	{
+		ERROR ("turbostat plugin: Invalid topology: %u threads, %u cores, %u packages",
+		       topology.num_threads, topology.num_cores, topology.num_packages);
+		return -1;
+	}
+
 	total_threads = topology.num_threads * topology.num_cores * topology.num_packages;
 	*threads = calloc(total_threads, sizeof(struct thread_data));
 	if (*threads == NULL)
-		goto err;
+	{
+		ERROR ("turbostat plugin: calloc failed");
+		return -1;
+	}
 
 	for (i = 0; i < total_threads; ++i)
 		(*threads)[i].cpu_id = topology.max_cpu_id + 1;
@@ -1264,21 +1276,22 @@ allocate_counters(struct thread_data **threads, struct core_data **cores, struct
 	total_cores = topology.num_cores * topology.num_packages;
 	*cores = calloc(total_cores, sizeof(struct core_data));
 	if (*cores == NULL)
-		goto err_clean_threads;
+	{
+		ERROR ("turbostat plugin: calloc failed");
+		sfree (threads);
+		return -1;
+	}
 
 	*packages = calloc(topology.num_packages, sizeof(struct pkg_data));
 	if (*packages == NULL)
-		goto err_clean_cores;
+	{
+		ERROR ("turbostat plugin: calloc failed");
+		sfree (cores);
+		sfree (threads);
+		return -1;
+	}
 
 	return 0;
-
-err_clean_cores:
-	free(*cores);
-err_clean_threads:
-	free(*threads);
-err:
-	ERROR("turbostat plugin: Failled to allocate memory for counters");
-	return -1;
 }
 
 static void