rtla: Change monitored_cpus from char * to cpu_set_t

Use a cpumask instead of a char *, reducing memory footprint and code.

No functional change, and in preparation for auto house-keeping.

Link: https://lkml.kernel.org/r/54c46293261d13cb1042d0314486539eeb45fe5d.1686066600.git.bristot@kernel.org
Cc: William White <chwhite@redhat.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Tested-by: Juri Lelli <juri.lelli@redhat.com>
Signed-off-by: Daniel Bristot de Oliveira <bristot@kernel.org>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>

diff --git a/tools/tracing/rtla/src/osnoise_hist.c b/tools/tracing/rtla/src/osnoise_hist.c
index d2b6817..b616a72 100644 (file)
--- a/tools/tracing/rtla/src/osnoise_hist.c
+++ b/tools/tracing/rtla/src/osnoise_hist.c
@@ -19,7 +19,7 @@
 
 struct osnoise_hist_params {
        char                    *cpus;
-       char                    *monitored_cpus;
+       cpu_set_t               monitored_cpus;
        char                    *trace_output;
        char                    *cgroup_name;
        unsigned long long      runtime;
@@ -274,7 +274,7 @@ static void osnoise_hist_header(struct osnoise_tool *tool)
                trace_seq_printf(s, "Index");
 
        for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->cpus && !params->monitored_cpus[cpu])
+               if (params->cpus && !CPU_ISSET(cpu, &params->monitored_cpus))
                        continue;
 
                if (!data->hist[cpu].count)
@@ -305,7 +305,7 @@ osnoise_print_summary(struct osnoise_hist_params *params,
                trace_seq_printf(trace->seq, "count:");
 
        for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->cpus && !params->monitored_cpus[cpu])
+               if (params->cpus && !CPU_ISSET(cpu, &params->monitored_cpus))
                        continue;
 
                if (!data->hist[cpu].count)
@@ -319,7 +319,7 @@ osnoise_print_summary(struct osnoise_hist_params *params,
                trace_seq_printf(trace->seq, "min:  ");
 
        for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->cpus && !params->monitored_cpus[cpu])
+               if (params->cpus && !CPU_ISSET(cpu, &params->monitored_cpus))
                        continue;
 
                if (!data->hist[cpu].count)
@@ -334,7 +334,7 @@ osnoise_print_summary(struct osnoise_hist_params *params,
                trace_seq_printf(trace->seq, "avg:  ");
 
        for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->cpus && !params->monitored_cpus[cpu])
+               if (params->cpus && !CPU_ISSET(cpu, &params->monitored_cpus))
                        continue;
 
                if (!data->hist[cpu].count)
@@ -352,7 +352,7 @@ osnoise_print_summary(struct osnoise_hist_params *params,
                trace_seq_printf(trace->seq, "max:  ");
 
        for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->cpus && !params->monitored_cpus[cpu])
+               if (params->cpus && !CPU_ISSET(cpu, &params->monitored_cpus))
                        continue;
 
                if (!data->hist[cpu].count)
@@ -387,7 +387,7 @@ osnoise_print_stats(struct osnoise_hist_params *params, struct osnoise_tool *too
                                         bucket * data->bucket_size);
 
                for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-                       if (params->cpus && !params->monitored_cpus[cpu])
+                       if (params->cpus && !CPU_ISSET(cpu, &params->monitored_cpus))
                                continue;
 
                        if (!data->hist[cpu].count)
@@ -411,7 +411,7 @@ osnoise_print_stats(struct osnoise_hist_params *params, struct osnoise_tool *too
                trace_seq_printf(trace->seq, "over: ");
 
        for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->cpus && !params->monitored_cpus[cpu])
+               if (params->cpus && !CPU_ISSET(cpu, &params->monitored_cpus))
                        continue;
 
                if (!data->hist[cpu].count)
@@ -559,7 +559,7 @@ static struct osnoise_hist_params
                                osnoise_hist_usage("Bucket size needs to be > 0 and <= 1000000\n");
                        break;
                case 'c':
-                       retval = parse_cpu_list(optarg, &params->monitored_cpus);
+                       retval = parse_cpu_set(optarg, &params->monitored_cpus);
                        if (retval)
                                osnoise_hist_usage("\nInvalid -c cpu list\n");
                        params->cpus = optarg;

diff --git a/tools/tracing/rtla/src/osnoise_top.c b/tools/tracing/rtla/src/osnoise_top.c
index fcf6c14..0e2f3b2 100644 (file)
--- a/tools/tracing/rtla/src/osnoise_top.c
+++ b/tools/tracing/rtla/src/osnoise_top.c
@@ -26,7 +26,7 @@ enum osnoise_mode {
  */
 struct osnoise_top_params {
        char                    *cpus;
-       char                    *monitored_cpus;
+       cpu_set_t               monitored_cpus;
        char                    *trace_output;
        char                    *cgroup_name;
        unsigned long long      runtime;
@@ -263,7 +263,7 @@ osnoise_print_stats(struct osnoise_top_params *params, struct osnoise_tool *top)
        osnoise_top_header(top);
 
        for (i = 0; i < nr_cpus; i++) {
-               if (params->cpus && !params->monitored_cpus[i])
+               if (params->cpus && !CPU_ISSET(i, &params->monitored_cpus))
                        continue;
                osnoise_top_print(top, i);
        }
@@ -397,7 +397,7 @@ struct osnoise_top_params *osnoise_top_parse_args(int argc, char **argv)
 
                        break;
                case 'c':
-                       retval = parse_cpu_list(optarg, &params->monitored_cpus);
+                       retval = parse_cpu_set(optarg, &params->monitored_cpus);
                        if (retval)
                                osnoise_top_usage(params, "\nInvalid -c cpu list\n");
                        params->cpus = optarg;

diff --git a/tools/tracing/rtla/src/timerlat_hist.c b/tools/tracing/rtla/src/timerlat_hist.c
index d48c05d..00287e9 100644 (file)
--- a/tools/tracing/rtla/src/timerlat_hist.c
+++ b/tools/tracing/rtla/src/timerlat_hist.c
@@ -19,7 +19,7 @@
 
 struct timerlat_hist_params {
        char                    *cpus;
-       char                    *monitored_cpus;
+       cpu_set_t               monitored_cpus;
        char                    *trace_output;
        char                    *cgroup_name;
        unsigned long long      runtime;
@@ -227,7 +227,7 @@ static void timerlat_hist_header(struct osnoise_tool *tool)
                trace_seq_printf(s, "Index");
 
        for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->cpus && !params->monitored_cpus[cpu])
+               if (params->cpus && !CPU_ISSET(cpu, &params->monitored_cpus))
                        continue;
 
                if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
@@ -263,7 +263,7 @@ timerlat_print_summary(struct timerlat_hist_params *params,
                trace_seq_printf(trace->seq, "count:");
 
        for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->cpus && !params->monitored_cpus[cpu])
+               if (params->cpus && !CPU_ISSET(cpu, &params->monitored_cpus))
                        continue;
 
                if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
@@ -283,7 +283,7 @@ timerlat_print_summary(struct timerlat_hist_params *params,
                trace_seq_printf(trace->seq, "min:  ");
 
        for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->cpus && !params->monitored_cpus[cpu])
+               if (params->cpus && !CPU_ISSET(cpu, &params->monitored_cpus))
                        continue;
 
                if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
@@ -303,7 +303,7 @@ timerlat_print_summary(struct timerlat_hist_params *params,
                trace_seq_printf(trace->seq, "avg:  ");
 
        for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->cpus && !params->monitored_cpus[cpu])
+               if (params->cpus && !CPU_ISSET(cpu, &params->monitored_cpus))
                        continue;
 
                if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
@@ -331,7 +331,7 @@ timerlat_print_summary(struct timerlat_hist_params *params,
                trace_seq_printf(trace->seq, "max:  ");
 
        for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->cpus && !params->monitored_cpus[cpu])
+               if (params->cpus && !CPU_ISSET(cpu, &params->monitored_cpus))
                        continue;
 
                if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
@@ -371,7 +371,7 @@ timerlat_print_stats(struct timerlat_hist_params *params, struct osnoise_tool *t
                                         bucket * data->bucket_size);
 
                for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-                       if (params->cpus && !params->monitored_cpus[cpu])
+                       if (params->cpus && !CPU_ISSET(cpu, &params->monitored_cpus))
                                continue;
 
                        if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
@@ -405,7 +405,7 @@ timerlat_print_stats(struct timerlat_hist_params *params, struct osnoise_tool *t
                trace_seq_printf(trace->seq, "over: ");
 
        for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->cpus && !params->monitored_cpus[cpu])
+               if (params->cpus && !CPU_ISSET(cpu, &params->monitored_cpus))
                        continue;
 
                if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
@@ -565,7 +565,7 @@ static struct timerlat_hist_params
 
                        break;
                case 'c':
-                       retval = parse_cpu_list(optarg, &params->monitored_cpus);
+                       retval = parse_cpu_set(optarg, &params->monitored_cpus);
                        if (retval)
                                timerlat_hist_usage("\nInvalid -c cpu list\n");
                        params->cpus = optarg;

diff --git a/tools/tracing/rtla/src/timerlat_top.c b/tools/tracing/rtla/src/timerlat_top.c
index 5395d1c..920f2f6 100644 (file)
--- a/tools/tracing/rtla/src/timerlat_top.c
+++ b/tools/tracing/rtla/src/timerlat_top.c
@@ -21,7 +21,7 @@
 
 struct timerlat_top_params {
        char                    *cpus;
-       char                    *monitored_cpus;
+       cpu_set_t               monitored_cpus;
        char                    *trace_output;
        char                    *cgroup_name;
        unsigned long long      runtime;
@@ -271,7 +271,7 @@ timerlat_print_stats(struct timerlat_top_params *params, struct osnoise_tool *to
        timerlat_top_header(top);
 
        for (i = 0; i < nr_cpus; i++) {
-               if (params->cpus && !params->monitored_cpus[i])
+               if (params->cpus && !CPU_ISSET(i, &params->monitored_cpus))
                        continue;
                timerlat_top_print(top, i);
        }
@@ -422,7 +422,7 @@ static struct timerlat_top_params
                        params->aa_only = 1;
                        break;
                case 'c':
-                       retval = parse_cpu_list(optarg, &params->monitored_cpus);
+                       retval = parse_cpu_set(optarg, &params->monitored_cpus);
                        if (retval)
                                timerlat_top_usage("\nInvalid -c cpu list\n");
                        params->cpus = optarg;

diff --git a/tools/tracing/rtla/src/utils.c b/tools/tracing/rtla/src/utils.c
index ee6fab0..8f9ad8f 100644 (file)
--- a/tools/tracing/rtla/src/utils.c
+++ b/tools/tracing/rtla/src/utils.c
@@ -89,69 +89,6 @@ void get_duration(time_t start_time, char *output, int output_size)
 }
 
 /*
- * parse_cpu_list - parse a cpu_list filling a char vector with cpus set
- *
- * Receives a cpu list, like 1-3,5 (cpus 1, 2, 3, 5), and then set the char
- * in the monitored_cpus.
- *
- * XXX: convert to a bitmask.
- */
-int parse_cpu_list(char *cpu_list, char **monitored_cpus)
-{
-       char *mon_cpus;
-       const char *p;
-       int end_cpu;
-       int nr_cpus;
-       int cpu;
-       int i;
-
-       nr_cpus = sysconf(_SC_NPROCESSORS_CONF);
-
-       mon_cpus = calloc(nr_cpus, sizeof(char));
-       if (!mon_cpus)
-               goto err;
-
-       for (p = cpu_list; *p; ) {
-               cpu = atoi(p);
-               if (cpu < 0 || (!cpu && *p != '0') || cpu >= nr_cpus)
-                       goto err;
-
-               while (isdigit(*p))
-                       p++;
-               if (*p == '-') {
-                       p++;
-                       end_cpu = atoi(p);
-                       if (end_cpu < cpu || (!end_cpu && *p != '0') || end_cpu >= nr_cpus)
-                               goto err;
-                       while (isdigit(*p))
-                               p++;
-               } else
-                       end_cpu = cpu;
-
-               if (cpu == end_cpu) {
-                       debug_msg("cpu_list: adding cpu %d\n", cpu);
-                       mon_cpus[cpu] = 1;
-               } else {
-                       for (i = cpu; i <= end_cpu; i++) {
-                               debug_msg("cpu_list: adding cpu %d\n", i);
-                               mon_cpus[i] = 1;
-                       }
-               }
-
-               if (*p == ',')
-                       p++;
-       }
-
-       *monitored_cpus = mon_cpus;
-
-       return 0;
-
-err:
-       debug_msg("Error parsing the cpu list %s", cpu_list);
-       return 1;
-}
-
-/*
  * parse_cpu_set - parse a cpu_list filling cpu_set_t argument
  *
  * Receives a cpu list, like 1-3,5 (cpus 1, 2, 3, 5), and then set