Fix: test_benchmark: do not match "CPU(s) scaling MHz:"

[lttng-ust.git] / src / common / smp.c

diff --git a/src/common/smp.c b/src/common/smp.c
index 88d66a40a3c0f049e34c46a290af11b4b5fea454..10b9954a5880d29e6ce10a0dc7d4095fdfcd7e69 100644 (file)
--- a/src/common/smp.c
+++ b/src/common/smp.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-only
+ * SPDX-License-Identifier: MIT
  *
  * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright (C) 2019 Michael Jeanson <mjeanson@efficios.com>
@@ -167,7 +167,7 @@ int get_cpu_mask_from_sysfs(char *buf, size_t max_bytes, const char *path)
 
                total_bytes_read += bytes_read;
                assert(total_bytes_read <= max_bytes);
-       } while (max_bytes > total_bytes_read && bytes_read > 0);
+       } while (max_bytes > total_bytes_read && bytes_read != 0);
 
        /*
         * Make sure the mask read is a null terminated string.
@@ -215,10 +215,6 @@ int get_max_cpuid_from_mask(const char *pmask, size_t len)
 
        cpu_index = strtoul(&pmask[i], &endptr, 10);
 
-       /*
-        * If we read a CPU index, increment it by one to return a number of
-        * CPUs.
-        */
        if ((&pmask[i] != endptr) && (cpu_index < INT_MAX))
                return (int) cpu_index;