cpupower tools: Fix issues with sysfs_topology_read_file

Fix a variety of issues with sysfs_topology_read_file:
* The return value of sysfs_topology_read_file function was not properly
  being checked for failure.
* The function was reading int valued sysfs variables and then returning
  their value. So, even if a function was trying to check the return value
  of this function, a caller would not be able to tell an failure code apart
  from reading a negative value. This also conflicted with the comment on the
  function which said that a return value of 0 indicated success.
* The function was parsing int valued sysfs values with strtoul instead of
  strtol.
* The function was non-static even though it was only used in the
  file it was declared in.

Signed-off-by: Palmer Cox <p@lmercox.com>
Signed-off-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/tools/power/cpupower/utils/helpers/topology.c b/tools/power/cpupower/utils/helpers/topology.c
index 4eae2c47ba48d20d9e62505e023d0dd0a1c7862f..216f3e3466ce4b0d73a7ad21b5a56946259edc3e 100644 (file)
--- a/tools/power/cpupower/utils/helpers/topology.c
+++ b/tools/power/cpupower/utils/helpers/topology.c
@@ -20,9 +20,8 @@
 #include <helpers/sysfs.h>
 
 /* returns -1 on failure, 0 on success */
-int sysfs_topology_read_file(unsigned int cpu, const char *fname)
+static int sysfs_topology_read_file(unsigned int cpu, const char *fname, int *result)
 {
-       unsigned long value;
        char linebuf[MAX_LINE_LEN];
        char *endp;
        char path[SYSFS_PATH_MAX];
@@ -31,10 +30,10 @@ int sysfs_topology_read_file(unsigned int cpu, const char *fname)
                         cpu, fname);
        if (sysfs_read_file(path, linebuf, MAX_LINE_LEN) == 0)
                return -1;
-       value = strtoul(linebuf, &endp, 0);
+       *result = strtol(linebuf, &endp, 0);
        if (endp == linebuf || errno == ERANGE)
                return -1;
-       return value;
+       return 0;
 }
 
 struct cpuid_core_info {
@@ -82,13 +81,19 @@ int get_cpu_topology(struct cpupower_topology *cpu_top)
        for (cpu = 0; cpu < cpus; cpu++) {
                cpu_top->core_info[cpu].cpu = cpu;
                cpu_top->core_info[cpu].is_online = sysfs_is_cpu_online(cpu);
-               cpu_top->core_info[cpu].pkg =
-                       sysfs_topology_read_file(cpu, "physical_package_id");
+               if(sysfs_topology_read_file(
+                       cpu,
+                       "physical_package_id",
+                       &(cpu_top->core_info[cpu].pkg)) < 0)
+                       return -1;
                if ((int)cpu_top->core_info[cpu].pkg != -1 &&
                    cpu_top->core_info[cpu].pkg > cpu_top->pkgs)
                        cpu_top->pkgs = cpu_top->core_info[cpu].pkg;
-               cpu_top->core_info[cpu].core =
-                       sysfs_topology_read_file(cpu, "core_id");
+               if(sysfs_topology_read_file(
+                       cpu,
+                       "core_id",
+                       &(cpu_top->core_info[cpu].core)) < 0)
+                       return -1;
        }
        cpu_top->pkgs++;