diff options
| author | Simon Quigley <tsimonq2@ubuntu.com> | 2018-02-27 22:34:49 -0600 |
|---|---|---|
| committer | Simon Quigley <tsimonq2@ubuntu.com> | 2018-02-27 22:34:49 -0600 |
| commit | 00831e690c4581ee8f0f92902ebdb75304bde817 (patch) | |
| tree | 55a37b9cc5d60ad047631ffb39d2f822a22d6d39 /hardinfo/cpu_util.c | |
| parent | d95f107ef2b9e82c341060be0def97d7bfa430b9 (diff) | |
| parent | 09fcc751ef158898c315ebc9299a0fa3a722d914 (diff) | |
Update upstream source from tag 'upstream/0.5.1+git20180227'
Update to upstream version '0.5.1+git20180227'
with Debian dir 7ca675e2ccb4367b7cc5b255a36b5173afaf9d2c
Diffstat (limited to 'hardinfo/cpu_util.c')
| -rw-r--r-- | hardinfo/cpu_util.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/hardinfo/cpu_util.c b/hardinfo/cpu_util.c index f5bddd5c..a598d2ed 100644 --- a/hardinfo/cpu_util.c +++ b/hardinfo/cpu_util.c @@ -85,7 +85,8 @@ int cpu_procs_cores_threads(int *p, int *c, int *t) { for (i = 0; i <= m; i++) { pack_id = get_cpu_int("topology/physical_package_id", i, CPU_TOPO_NULL); core_id = get_cpu_int("topology/core_id", i, CPU_TOPO_NULL); - if (pack_id >= 0) { CPUBIT_SET(packs, pack_id); } + if (pack_id < 0) pack_id = 0; + CPUBIT_SET(packs, pack_id); if (core_id >= 0) { CPUBIT_SET(cores, (pack_id * MAX_CORES_PER_PACK) + core_id ); } } *t = cpubits_count(threads); @@ -128,6 +129,11 @@ void cpufreq_update(cpufreq_data *cpufd, int cur_only) cpufd->cpukhz_max = get_cpu_int("cpufreq/scaling_max_freq", cpufd->id, 0); if (cpufd->scaling_driver == NULL) cpufd->scaling_driver = g_strdup("(Unknown)"); if (cpufd->scaling_governor == NULL) cpufd->scaling_governor = g_strdup("(Unknown)"); + + /* x86 uses freqdomain_cpus, all others use affected_cpus */ + cpufd->shared_list = get_cpu_str("cpufreq/freqdomain_cpus", cpufd->id); + if (cpufd->shared_list == NULL) cpufd->shared_list = get_cpu_str("cpufreq/affected_cpus", cpufd->id); + if (cpufd->shared_list == NULL) cpufd->shared_list = g_strdup_printf("%d", cpufd->id); } } |