Use proper error handling in topology module. Fixes RRZE-HPC#619, sec…

…ond attempt
breiters · Sep 10, 2024 · fc37b60 · fc37b60
1 parent 6753374
commit fc37b60
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/topology.c b/src/topology.c
@@ -1436,7 +1436,6 @@ topology_init(void)
         {
             cpuid_topology.activeHWThreads = sysconf(_SC_NPROCESSORS_CONF);
         }
-        cpuid_topology.activeHWThreads = activeHWThreads;
         ret = funcs.init_cpuInfo(cpuSet);
         if (ret < 0)
         {

diff --git a/src/topology_proc.c b/src/topology_proc.c
@@ -599,7 +599,7 @@ proc_init_cpuFeatures(void)
     bstrListDestroy(flaglist);
 
     get_cpu_perf_data();
-    return;
+    return 0;
 }
 
 int
-Original file line number
+Diff line change
@@ Expand Up / @@ -599,7 +599,7 @@ proc_init_cpuFeatures(void) @@
         bstrListDestroy(flaglist);
         get_cpu_perf_data();
-        return;
+        return 0;
     }
     int
@@ Expand Down @@