mirror/libcpuid
1
0
Fork 0
mirror of https://github.com/anrieff/libcpuid synced 2024-11-10 22:59:13 +00:00
Code Issues Releases Wiki Activity

Improve error handling in cpu_identify_all()

Browse source
This commit is contained in:
The Tumultuous Unicorn Of Darkness 2024-08-04 15:11:15 +02:00
parent 8f6b84d86c
commit 673f4e45ff
No known key found for this signature in database
GPG key ID: 1E55EE2EFF18BC1A
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libcpuid/cpuid_main.c
View file

@ -1653,8 +1653,7 @@ static void update_cache_instances(struct internal_cache_instances_t* caches,
int cpu_identify_all(struct cpu_raw_data_array_t* raw_array, struct system_id_t* system) int cpu_identify_all(struct cpu_raw_data_array_t* raw_array, struct system_id_t* system)
{ {
int cur_error = cpuid_set_error(ERR_OK); int r = ERR_OK;
int ret_error = cpuid_set_error(ERR_OK);
double smt_divisor; double smt_divisor;
bool is_smt_supported; bool is_smt_supported;
bool is_topology_supported = true; bool is_topology_supported = true;
@ -1672,8 +1671,8 @@ int cpu_identify_all(struct cpu_raw_data_array_t* raw_array, struct system_id_t*
if (system == NULL) if (system == NULL)
return cpuid_set_error(ERR_HANDLE); return cpuid_set_error(ERR_HANDLE);
if (!raw_array) { if (!raw_array) {
if ((ret_error = cpuid_get_all_raw_data(&my_raw_array)) < 0) if ((r = cpuid_get_all_raw_data(&my_raw_array)) < 0)
return cpuid_set_error(ret_error); return r;
raw_array = &my_raw_array; raw_array = &my_raw_array;
} }
system_id_t_constructor(system); system_id_t_constructor(system);
@ -1703,10 +1702,9 @@ int cpu_identify_all(struct cpu_raw_data_array_t* raw_array, struct system_id_t*
cpu_type_index = system->num_cpu_types; cpu_type_index = system->num_cpu_types;
cpuid_grow_system_id(system, system->num_cpu_types + 1); cpuid_grow_system_id(system, system->num_cpu_types + 1);
cpuid_grow_type_info(&type_info, type_info.num + 1); cpuid_grow_type_info(&type_info, type_info.num + 1);
cur_error = cpu_ident_internal(&raw_array->raw[logical_cpu], &system->cpu_types[cpu_type_index], &type_info.data[cpu_type_index].id_info); if ((r = cpu_ident_internal(&raw_array->raw[logical_cpu], &system->cpu_types[cpu_type_index], &type_info.data[cpu_type_index].id_info)) != ERR_OK)
return r;
type_info.data[cpu_type_index].purpose = purpose; type_info.data[cpu_type_index].purpose = purpose;
if (ret_error == ERR_OK)
ret_error = cur_error;
if (is_topology_supported) if (is_topology_supported)
type_info.data[cpu_type_index].package_id = cur_package_id; type_info.data[cpu_type_index].package_id = cur_package_id;
if (raw_array->with_affinity) if (raw_array->with_affinity)
@ -1759,7 +1757,7 @@ int cpu_identify_all(struct cpu_raw_data_array_t* raw_array, struct system_id_t*
system->l4_total_instances = caches_all.instances[L4]; system->l4_total_instances = caches_all.instances[L4];
} }
return ret_error; return cpuid_set_error(ERR_OK);
} }
int cpu_request_core_type(cpu_purpose_t purpose, struct cpu_raw_data_array_t* raw_array, struct cpu_id_t* data) int cpu_request_core_type(cpu_purpose_t purpose, struct cpu_raw_data_array_t* raw_array, struct cpu_id_t* data)