Try more than one sysctl to get CPU temperature. (#330)

* Try more than one sysctl to get CPU temperature. Suggested by: walter@pelissero.de Reference: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210235 * Added braces and using else ifs.
brndnmtthws · Oct 7, 2016 · 271ca6d · 271ca6d
1 parent e51301a
commit 271ca6d
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/freebsd.cc b/src/freebsd.cc
@@ -426,13 +426,16 @@ double get_acpi_temperature(int fd)
 	int temp;
 	(void)fd;
 
-	if (GETSYSCTL("hw.acpi.thermal.tz0.temperature", temp)) {
-		fprintf(stderr,
-			"Cannot read sysctl \"hw.acpi.thermal.tz0.temperature\"\n");
-		return 0.0;
+	if (GETSYSCTL("hw.acpi.thermal.tz0.temperature", temp) == 0) {
+		return KELVTOC(temp);
+	} else if (GETSYSCTL("dev.cpu.0.temperature", temp) == 0) {
+		return KELVTOC(temp);
+	} else if (GETSYSCTL("dev.amdtemp.0.core0.sensor0", temp) == 0) {
+		return KELVTOC(temp);
 	}
+	fprintf(stderr, "Cannot get temperature from sysctl\n");
 
-	return KELVTOC(temp);
+	return 0.0;
 }
 
 static void get_battery_stats(int *battime, int *batcapacity, int *batstate, int *ac) {