tools/rtla: Remove unneeded nr_cpus from for_each_monitored_cpu

nr_cpus does not change at runtime, so passing it through the macro
argument is unnecessary.

Remove the argument and use the global nr_cpus instead.

Signed-off-by: Costa Shulyupin <costa.shul@redhat.com>
Link: https://lore.kernel.org/r/20260306194953.2511960-5-costa.shul@redhat.com
Signed-off-by: Tomas Glozar <tglozar@redhat.com>

diff --git a/tools/tracing/rtla/src/common.h b/tools/tracing/rtla/src/common.h
index 90a3c0d1dbf399dfc7c2b9ce3f6e6a1bed3c040d..22ec436a93cc1ba239795a8d28dd37609bc846eb 100644 (file)
--- a/tools/tracing/rtla/src/common.h
+++ b/tools/tracing/rtla/src/common.h
@@ -110,7 +110,7 @@ struct common_params {
 
 extern int nr_cpus;
 
-#define for_each_monitored_cpu(cpu, nr_cpus, common) \
+#define for_each_monitored_cpu(cpu, common) \
        for (cpu = 0; cpu < nr_cpus; cpu++) \
                if (!(common)->cpus || CPU_ISSET(cpu, &(common)->monitored_cpus))
 

diff --git a/tools/tracing/rtla/src/osnoise_hist.c b/tools/tracing/rtla/src/osnoise_hist.c
index 5bbec27b46a7002c06b98c251a7554fed63826d5..4181e025511a8f1622294a3322fb146da405aae8 100644 (file)
--- a/tools/tracing/rtla/src/osnoise_hist.c
+++ b/tools/tracing/rtla/src/osnoise_hist.c
@@ -244,7 +244,7 @@ static void osnoise_hist_header(struct osnoise_tool *tool)
        if (!params->common.hist.no_index)
                trace_seq_printf(s, "Index");
 
-       for_each_monitored_cpu(cpu, nr_cpus, &params->common) {
+       for_each_monitored_cpu(cpu, &params->common) {
 
                if (!data->hist[cpu].count)
                        continue;
@@ -273,8 +273,7 @@ osnoise_print_summary(struct osnoise_params *params,
        if (!params->common.hist.no_index)
                trace_seq_printf(trace->seq, "count:");
 
-       for_each_monitored_cpu(cpu, nr_cpus, &params->common) {
-
+       for_each_monitored_cpu(cpu, &params->common) {
                if (!data->hist[cpu].count)
                        continue;
 
@@ -285,7 +284,7 @@ osnoise_print_summary(struct osnoise_params *params,
        if (!params->common.hist.no_index)
                trace_seq_printf(trace->seq, "min:  ");
 
-       for_each_monitored_cpu(cpu, nr_cpus, &params->common) {
+       for_each_monitored_cpu(cpu, &params->common) {
 
                if (!data->hist[cpu].count)
                        continue;
@@ -298,7 +297,7 @@ osnoise_print_summary(struct osnoise_params *params,
        if (!params->common.hist.no_index)
                trace_seq_printf(trace->seq, "avg:  ");
 
-       for_each_monitored_cpu(cpu, nr_cpus, &params->common) {
+       for_each_monitored_cpu(cpu, &params->common) {
 
                if (!data->hist[cpu].count)
                        continue;
@@ -314,7 +313,7 @@ osnoise_print_summary(struct osnoise_params *params,
        if (!params->common.hist.no_index)
                trace_seq_printf(trace->seq, "max:  ");
 
-       for_each_monitored_cpu(cpu, nr_cpus, &params->common) {
+       for_each_monitored_cpu(cpu, &params->common) {
 
                if (!data->hist[cpu].count)
                        continue;
@@ -349,7 +348,7 @@ osnoise_print_stats(struct osnoise_tool *tool)
                        trace_seq_printf(trace->seq, "%-6d",
                                         bucket * data->bucket_size);
 
-               for_each_monitored_cpu(cpu, nr_cpus, &params->common) {
+               for_each_monitored_cpu(cpu, &params->common) {
 
                        if (!data->hist[cpu].count)
                                continue;
@@ -385,7 +384,7 @@ osnoise_print_stats(struct osnoise_tool *tool)
        if (!params->common.hist.no_index)
                trace_seq_printf(trace->seq, "over: ");
 
-       for_each_monitored_cpu(cpu, nr_cpus, &params->common) {
+       for_each_monitored_cpu(cpu, &params->common) {
 
                if (!data->hist[cpu].count)
                        continue;

diff --git a/tools/tracing/rtla/src/osnoise_top.c b/tools/tracing/rtla/src/osnoise_top.c
index 672cdb254f4c7622329ab79cfaab1ed102fd3c31..f92caea9f2e90fc99dcdd996688881d0f6048675 100644 (file)
--- a/tools/tracing/rtla/src/osnoise_top.c
+++ b/tools/tracing/rtla/src/osnoise_top.c
@@ -236,7 +236,7 @@ osnoise_print_stats(struct osnoise_tool *top)
 
        osnoise_top_header(top);
 
-       for_each_monitored_cpu(i, nr_cpus, &params->common) {
+       for_each_monitored_cpu(i, &params->common) {
                osnoise_top_print(top, i);
        }
 

diff --git a/tools/tracing/rtla/src/timerlat.c b/tools/tracing/rtla/src/timerlat.c
index 31c921efa7c16e45a3cd468d374a61ce130ea4f7..8a44537e25cb5642dd096bd04bd24d958a797b1f 100644 (file)
--- a/tools/tracing/rtla/src/timerlat.c
+++ b/tools/tracing/rtla/src/timerlat.c
@@ -115,7 +115,7 @@ int timerlat_enable(struct osnoise_tool *tool)
                        return -1;
                }
 
-               for_each_monitored_cpu(i, nr_cpus, &params->common) {
+               for_each_monitored_cpu(i, &params->common) {
                        if (save_cpu_idle_disable_state(i) < 0) {
                                err_msg("Could not save cpu idle state.\n");
                                return -1;
@@ -218,7 +218,7 @@ void timerlat_free(struct osnoise_tool *tool)
        if (dma_latency_fd >= 0)
                close(dma_latency_fd);
        if (params->deepest_idle_state >= -1) {
-               for_each_monitored_cpu(i, nr_cpus, &params->common) {
+               for_each_monitored_cpu(i, &params->common) {
                        restore_cpu_idle_disable_state(i);
                }
        }

diff --git a/tools/tracing/rtla/src/timerlat_hist.c b/tools/tracing/rtla/src/timerlat_hist.c
index cfb745b75b8aca0d983456563ef002abcaff4d7f..ee1af251c94dc18d9aa566f2ccda357ea4236e24 100644 (file)
--- a/tools/tracing/rtla/src/timerlat_hist.c
+++ b/tools/tracing/rtla/src/timerlat_hist.c
@@ -298,7 +298,7 @@ static void timerlat_hist_header(struct osnoise_tool *tool)
        if (!params->common.hist.no_index)
                trace_seq_printf(s, "Index");
 
-       for_each_monitored_cpu(cpu, nr_cpus, &params->common) {
+       for_each_monitored_cpu(cpu, &params->common) {
 
                if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
                        continue;
@@ -350,7 +350,7 @@ timerlat_print_summary(struct timerlat_params *params,
        if (!params->common.hist.no_index)
                trace_seq_printf(trace->seq, "count:");
 
-       for_each_monitored_cpu(cpu, nr_cpus, &params->common) {
+       for_each_monitored_cpu(cpu, &params->common) {
 
                if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
                        continue;
@@ -372,7 +372,7 @@ timerlat_print_summary(struct timerlat_params *params,
        if (!params->common.hist.no_index)
                trace_seq_printf(trace->seq, "min:  ");
 
-       for_each_monitored_cpu(cpu, nr_cpus, &params->common) {
+       for_each_monitored_cpu(cpu, &params->common) {
 
                if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
                        continue;
@@ -400,7 +400,7 @@ timerlat_print_summary(struct timerlat_params *params,
        if (!params->common.hist.no_index)
                trace_seq_printf(trace->seq, "avg:  ");
 
-       for_each_monitored_cpu(cpu, nr_cpus, &params->common) {
+       for_each_monitored_cpu(cpu, &params->common) {
 
                if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
                        continue;
@@ -428,7 +428,7 @@ timerlat_print_summary(struct timerlat_params *params,
        if (!params->common.hist.no_index)
                trace_seq_printf(trace->seq, "max:  ");
 
-       for_each_monitored_cpu(cpu, nr_cpus, &params->common) {
+       for_each_monitored_cpu(cpu, &params->common) {
 
                if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
                        continue;
@@ -473,7 +473,7 @@ timerlat_print_stats_all(struct timerlat_params *params,
        sum.min_thread = ~0;
        sum.min_user = ~0;
 
-       for_each_monitored_cpu(cpu, nr_cpus, &params->common) {
+       for_each_monitored_cpu(cpu, &params->common) {
 
                if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
                        continue;
@@ -620,7 +620,7 @@ timerlat_print_stats(struct osnoise_tool *tool)
                        trace_seq_printf(trace->seq, "%-6d",
                                         bucket * data->bucket_size);
 
-               for_each_monitored_cpu(cpu, nr_cpus, &params->common) {
+               for_each_monitored_cpu(cpu, &params->common) {
 
                        if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
                                continue;
@@ -658,7 +658,7 @@ timerlat_print_stats(struct osnoise_tool *tool)
        if (!params->common.hist.no_index)
                trace_seq_printf(trace->seq, "over: ");
 
-       for_each_monitored_cpu(cpu, nr_cpus, &params->common) {
+       for_each_monitored_cpu(cpu, &params->common) {
 
                if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
                        continue;

diff --git a/tools/tracing/rtla/src/timerlat_top.c b/tools/tracing/rtla/src/timerlat_top.c
index 8fad4edb0d72fdef87956b8e21f6502e54c9f1f5..cc296c9d7fe7323f09edb1a7bec0e97978baa637 100644 (file)
--- a/tools/tracing/rtla/src/timerlat_top.c
+++ b/tools/tracing/rtla/src/timerlat_top.c
@@ -446,7 +446,7 @@ timerlat_print_stats(struct osnoise_tool *top)
 
        timerlat_top_header(params, top);
 
-       for_each_monitored_cpu(i, nr_cpus, &params->common) {
+       for_each_monitored_cpu(i, &params->common) {
                timerlat_top_print(top, i);
                timerlat_top_update_sum(top, i, &summary);
        }