change sysctl of cpuinfo

Author: cyyever

src/freebsd/api.h

@@ -7,6 +7,7 @@ struct cpuinfo_freebsd_topology {
 	uint32_t packages;
 	uint32_t cores;
 	uint32_t threads;
+	uint32_t threads_per_core;
 };
 
 

src/freebsd/topology.c

@@ -8,25 +8,27 @@
 #include <cpuinfo/log.h>
 #include <freebsd/api.h>
 
-
-
-struct cpuinfo_freebsd_topology cpuinfo_freebsd_detect_topology(void) {
-	int threads = 1;
-	size_t sizeof_threads = sizeof(threads);
-	if (sysctlbyname("hw.ncpu", &threads, &sizeof_threads, NULL, 0) != 0) {
-		cpuinfo_log_error("sysctlbyname(\"hw.ncpu\") failed: %s", strerror(errno));
-	} else if (threads <= 0) {
-		cpuinfo_log_error("sysctlbyname(\"hw.ncpu\") returned invalid value %d", threads);
+static int cpuinfo_from_freebsd_sysctl(const char *name) {
+	int value = 0;
+	size_t sizeof_int = sizeof(value);
+	if (sysctlbyname(name, &value, &sizeof_int, NULL, 0) != 0) {
+		cpuinfo_log_error("sysctlbyname(\"%s\") failed: %s", name, strerror(errno));
+	} else if (value <= 0) {
+		cpuinfo_log_error("sysctlbyname(\"%s\") returned invalid value %d", name, value);
 	}
+	return value;
+}
 
-    int cores = threads / 2;
-	int packages = 1;
-
-	cpuinfo_log_debug("freebsd topology: packages = %d, cores = %d, threads = %d", packages, (int) cores, (int) threads);
+struct cpuinfo_freebsd_topology cpuinfo_freebsd_detect_topology(void) {
+	int packages = cpuinfo_from_freebsd_sysctl("kern.smp.cpus");
+	int cores = cpuinfo_from_freebsd_sysctl("kern.smp.cores");
+	int threads_per_core = cpuinfo_from_freebsd_sysctl("kern.smp.threads_per_core");
+	cpuinfo_log_debug("freebsd topology: packages = %d, cores = %d, threads_per_core = %d", packages, cores, threads_per_core);
 	struct cpuinfo_freebsd_topology topology = {
 		.packages = (uint32_t) packages,
 		.cores = (uint32_t) cores,
-		.threads = (uint32_t) threads
+		.threads_per_core = (uint32_t) threads_per_core,
+		.threads = (uint32_t) (threads_per_core * cores)
 	};
 
 	return topology;

src/x86/freebsd/init.c

@@ -61,7 +61,7 @@ void cpuinfo_x86_freebsd_init(void) {
 	char brand_string[48];
 	cpuinfo_x86_normalize_brand_string(x86_processor.brand_string, brand_string);
 
-	const uint32_t threads_per_core = freebsd_topology.threads / freebsd_topology.cores;
+	const uint32_t threads_per_core = freebsd_topology.threads_per_core;
 	const uint32_t threads_per_package = freebsd_topology.threads / freebsd_topology.packages;
 	const uint32_t cores_per_package = freebsd_topology.cores / freebsd_topology.packages;
 	for (uint32_t i = 0; i < freebsd_topology.packages; i++) {