tools/rtla: Add for_each_monitored_cpu() helper

The rtla tools have many instances of iterating over CPUs while
checking if they are monitored.

Add a for_each_monitored_cpu() helper macro to make the code
more readable and reduce code duplication.

Signed-off-by: Costa Shulyupin <costa.shul@redhat.com>
Reviewed-by: Tomas Glozar <tglozar@redhat.com>
Link: https://lore.kernel.org/r/20251002123553.389467-1-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 355f113a14a3647063eacf753d340cb566daa319..9ec2b7632c376eb2f01c2f43ef4bb3fc1d237e5b 100644 (file)
--- a/tools/tracing/rtla/src/common.h
+++ b/tools/tracing/rtla/src/common.h
@@ -107,6 +107,10 @@ struct common_params {
        struct timerlat_u_params user;
 };
 
+#define for_each_monitored_cpu(cpu, nr_cpus, common) \
+       for (cpu = 0; cpu < nr_cpus; cpu++) \
+               if (!(common)->cpus || CPU_ISSET(cpu, &(common)->monitored_cpus))
+
 struct tool_ops;
 
 /*

diff --git a/tools/tracing/rtla/src/osnoise_hist.c b/tools/tracing/rtla/src/osnoise_hist.c
index dffb6d0a98d7d95bc3d84d1755c20eb834d797c9..844f0468953c5be3057277874bafa114366d2977 100644 (file)
--- a/tools/tracing/rtla/src/osnoise_hist.c
+++ b/tools/tracing/rtla/src/osnoise_hist.c
@@ -247,9 +247,7 @@ static void osnoise_hist_header(struct osnoise_tool *tool)
        if (!params->common.hist.no_index)
                trace_seq_printf(s, "Index");
 
-       for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->common.cpus && !CPU_ISSET(cpu, &params->common.monitored_cpus))
-                       continue;
+       for_each_monitored_cpu(cpu, data->nr_cpus, &params->common) {
 
                if (!data->hist[cpu].count)
                        continue;
@@ -278,9 +276,7 @@ osnoise_print_summary(struct osnoise_params *params,
        if (!params->common.hist.no_index)
                trace_seq_printf(trace->seq, "count:");
 
-       for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->common.cpus && !CPU_ISSET(cpu, &params->common.monitored_cpus))
-                       continue;
+       for_each_monitored_cpu(cpu, data->nr_cpus, &params->common) {
 
                if (!data->hist[cpu].count)
                        continue;
@@ -292,9 +288,7 @@ osnoise_print_summary(struct osnoise_params *params,
        if (!params->common.hist.no_index)
                trace_seq_printf(trace->seq, "min:  ");
 
-       for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->common.cpus && !CPU_ISSET(cpu, &params->common.monitored_cpus))
-                       continue;
+       for_each_monitored_cpu(cpu, data->nr_cpus, &params->common) {
 
                if (!data->hist[cpu].count)
                        continue;
@@ -307,9 +301,7 @@ osnoise_print_summary(struct osnoise_params *params,
        if (!params->common.hist.no_index)
                trace_seq_printf(trace->seq, "avg:  ");
 
-       for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->common.cpus && !CPU_ISSET(cpu, &params->common.monitored_cpus))
-                       continue;
+       for_each_monitored_cpu(cpu, data->nr_cpus, &params->common) {
 
                if (!data->hist[cpu].count)
                        continue;
@@ -325,9 +317,7 @@ osnoise_print_summary(struct osnoise_params *params,
        if (!params->common.hist.no_index)
                trace_seq_printf(trace->seq, "max:  ");
 
-       for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->common.cpus && !CPU_ISSET(cpu, &params->common.monitored_cpus))
-                       continue;
+       for_each_monitored_cpu(cpu, data->nr_cpus, &params->common) {
 
                if (!data->hist[cpu].count)
                        continue;
@@ -362,9 +352,7 @@ osnoise_print_stats(struct osnoise_tool *tool)
                        trace_seq_printf(trace->seq, "%-6d",
                                         bucket * data->bucket_size);
 
-               for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-                       if (params->common.cpus && !CPU_ISSET(cpu, &params->common.monitored_cpus))
-                               continue;
+               for_each_monitored_cpu(cpu, data->nr_cpus, &params->common) {
 
                        if (!data->hist[cpu].count)
                                continue;
@@ -400,9 +388,7 @@ osnoise_print_stats(struct osnoise_tool *tool)
        if (!params->common.hist.no_index)
                trace_seq_printf(trace->seq, "over: ");
 
-       for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->common.cpus && !CPU_ISSET(cpu, &params->common.monitored_cpus))
-                       continue;
+       for_each_monitored_cpu(cpu, data->nr_cpus, &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 95418f7ecc9613f4fd416dc170c1f0ab0bb7576e..defa1eb63bee0a171c68a68eb1f76fc894e2a283 100644 (file)
--- a/tools/tracing/rtla/src/osnoise_top.c
+++ b/tools/tracing/rtla/src/osnoise_top.c
@@ -243,9 +243,7 @@ osnoise_print_stats(struct osnoise_tool *top)
 
        osnoise_top_header(top);
 
-       for (i = 0; i < nr_cpus; i++) {
-               if (params->common.cpus && !CPU_ISSET(i, &params->common.monitored_cpus))
-                       continue;
+       for_each_monitored_cpu(i, nr_cpus, &params->common) {
                osnoise_top_print(top, i);
        }
 

diff --git a/tools/tracing/rtla/src/timerlat.c b/tools/tracing/rtla/src/timerlat.c
index b692128741279481e697ea3847c5c51c15e56930..28ea4f6710c184cac98d82989b733e63bdf30759 100644 (file)
--- a/tools/tracing/rtla/src/timerlat.c
+++ b/tools/tracing/rtla/src/timerlat.c
@@ -126,9 +126,7 @@ int timerlat_enable(struct osnoise_tool *tool)
 
                nr_cpus = sysconf(_SC_NPROCESSORS_CONF);
 
-               for (i = 0; i < nr_cpus; i++) {
-                       if (params->common.cpus && !CPU_ISSET(i, &params->common.monitored_cpus))
-                               continue;
+               for_each_monitored_cpu(i, nr_cpus, &params->common) {
                        if (save_cpu_idle_disable_state(i) < 0) {
                                err_msg("Could not save cpu idle state.\n");
                                return -1;
@@ -221,10 +219,7 @@ void timerlat_free(struct osnoise_tool *tool)
        if (dma_latency_fd >= 0)
                close(dma_latency_fd);
        if (params->deepest_idle_state >= -1) {
-               for (i = 0; i < nr_cpus; i++) {
-                       if (params->common.cpus &&
-                           !CPU_ISSET(i, &params->common.monitored_cpus))
-                               continue;
+               for_each_monitored_cpu(i, nr_cpus, &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 606c1688057b2737e25613b0303a44fb4780d014..02d3ffd2cf4b1b8dcfe9d1b779741aff02d3ca8e 100644 (file)
--- a/tools/tracing/rtla/src/timerlat_hist.c
+++ b/tools/tracing/rtla/src/timerlat_hist.c
@@ -305,9 +305,7 @@ static void timerlat_hist_header(struct osnoise_tool *tool)
        if (!params->common.hist.no_index)
                trace_seq_printf(s, "Index");
 
-       for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->common.cpus && !CPU_ISSET(cpu, &params->common.monitored_cpus))
-                       continue;
+       for_each_monitored_cpu(cpu, data->nr_cpus, &params->common) {
 
                if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
                        continue;
@@ -359,9 +357,7 @@ timerlat_print_summary(struct timerlat_params *params,
        if (!params->common.hist.no_index)
                trace_seq_printf(trace->seq, "count:");
 
-       for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->common.cpus && !CPU_ISSET(cpu, &params->common.monitored_cpus))
-                       continue;
+       for_each_monitored_cpu(cpu, data->nr_cpus, &params->common) {
 
                if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
                        continue;
@@ -383,9 +379,7 @@ timerlat_print_summary(struct timerlat_params *params,
        if (!params->common.hist.no_index)
                trace_seq_printf(trace->seq, "min:  ");
 
-       for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->common.cpus && !CPU_ISSET(cpu, &params->common.monitored_cpus))
-                       continue;
+       for_each_monitored_cpu(cpu, data->nr_cpus, &params->common) {
 
                if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
                        continue;
@@ -413,9 +407,7 @@ timerlat_print_summary(struct timerlat_params *params,
        if (!params->common.hist.no_index)
                trace_seq_printf(trace->seq, "avg:  ");
 
-       for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->common.cpus && !CPU_ISSET(cpu, &params->common.monitored_cpus))
-                       continue;
+       for_each_monitored_cpu(cpu, data->nr_cpus, &params->common) {
 
                if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
                        continue;
@@ -443,9 +435,7 @@ timerlat_print_summary(struct timerlat_params *params,
        if (!params->common.hist.no_index)
                trace_seq_printf(trace->seq, "max:  ");
 
-       for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->common.cpus && !CPU_ISSET(cpu, &params->common.monitored_cpus))
-                       continue;
+       for_each_monitored_cpu(cpu, data->nr_cpus, &params->common) {
 
                if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
                        continue;
@@ -490,9 +480,7 @@ timerlat_print_stats_all(struct timerlat_params *params,
        sum.min_thread = ~0;
        sum.min_user = ~0;
 
-       for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->common.cpus && !CPU_ISSET(cpu, &params->common.monitored_cpus))
-                       continue;
+       for_each_monitored_cpu(cpu, data->nr_cpus, &params->common) {
 
                if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
                        continue;
@@ -639,9 +627,7 @@ timerlat_print_stats(struct osnoise_tool *tool)
                        trace_seq_printf(trace->seq, "%-6d",
                                         bucket * data->bucket_size);
 
-               for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-                       if (params->common.cpus && !CPU_ISSET(cpu, &params->common.monitored_cpus))
-                               continue;
+               for_each_monitored_cpu(cpu, data->nr_cpus, &params->common) {
 
                        if (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)
                                continue;
@@ -679,9 +665,7 @@ timerlat_print_stats(struct osnoise_tool *tool)
        if (!params->common.hist.no_index)
                trace_seq_printf(trace->seq, "over: ");
 
-       for (cpu = 0; cpu < data->nr_cpus; cpu++) {
-               if (params->common.cpus && !CPU_ISSET(cpu, &params->common.monitored_cpus))
-                       continue;
+       for_each_monitored_cpu(cpu, data->nr_cpus, &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 fc479a0dcb597a56abd3ba52aca574ed3a6ef534..607b57f2f231c7cd9f05c70d32cbc74e93a71e6b 100644 (file)
--- a/tools/tracing/rtla/src/timerlat_top.c
+++ b/tools/tracing/rtla/src/timerlat_top.c
@@ -459,9 +459,7 @@ timerlat_print_stats(struct osnoise_tool *top)
 
        timerlat_top_header(params, top);
 
-       for (i = 0; i < nr_cpus; i++) {
-               if (params->common.cpus && !CPU_ISSET(i, &params->common.monitored_cpus))
-                       continue;
+       for_each_monitored_cpu(i, nr_cpus, &params->common) {
                timerlat_top_print(top, i);
                timerlat_top_update_sum(top, i, &summary);
        }