perf hist: Add symbol_conf.skip_empty

Add the skip_empty flag to symbol_conf and set the value from the report
command to preserve the existing behavior.  This makes the code simpler
and will be needed other code which is hard to add a new argument.

Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20240607202918.2357459-4-namhyung@kernel.org

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 50d2fb222d489e0032600c607782de0427ad207b..b10b7f00565879441d750059ae9135a74c1a9810 100644 (file)
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -571,8 +571,8 @@ static int __cmd_annotate(struct perf_annotate *ann)
                goto out;
 
        if (dump_trace) {
-               perf_session__fprintf_nr_events(session, stdout, false);
-               evlist__fprintf_nr_events(session->evlist, stdout, false);
+               perf_session__fprintf_nr_events(session, stdout);
+               evlist__fprintf_nr_events(session->evlist, stdout);
                goto out;
        }
 

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 69618fb0110b64ea7ed0a65ceda186cca3b0cc99..9718770facb52aa6bc2c71b3e79754ff7c6a4b02 100644 (file)
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -810,8 +810,8 @@ static int stats_print(struct report *rep)
 {
        struct perf_session *session = rep->session;
 
-       perf_session__fprintf_nr_events(session, stdout, rep->skip_empty);
-       evlist__fprintf_nr_events(session->evlist, stdout, rep->skip_empty);
+       perf_session__fprintf_nr_events(session, stdout);
+       evlist__fprintf_nr_events(session->evlist, stdout);
        return 0;
 }
 
@@ -1089,10 +1089,8 @@ static int __cmd_report(struct report *rep)
                        perf_session__fprintf_dsos(session, stdout);
 
                if (dump_trace) {
-                       perf_session__fprintf_nr_events(session, stdout,
-                                                       rep->skip_empty);
-                       evlist__fprintf_nr_events(session->evlist, stdout,
-                                                 rep->skip_empty);
+                       perf_session__fprintf_nr_events(session, stdout);
+                       evlist__fprintf_nr_events(session->evlist, stdout);
                        return 0;
                }
        }
@@ -1562,6 +1560,8 @@ int cmd_report(int argc, const char **argv)
        data.path  = input_name;
        data.force = symbol_conf.force;
 
+       symbol_conf.skip_empty = report.skip_empty;
+
 repeat:
        session = perf_session__new(&data, &report.tool);
        if (IS_ERR(session)) {

diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c
index b849caace398efc224cb68fec03b1db1c3ec6c66..9372e8904d225e14ff73cfd0728e003981aa21c4 100644 (file)
--- a/tools/perf/ui/stdio/hist.c
+++ b/tools/perf/ui/stdio/hist.c
@@ -897,8 +897,7 @@ out:
        return ret;
 }
 
-size_t events_stats__fprintf(struct events_stats *stats, FILE *fp,
-                            bool skip_empty)
+size_t events_stats__fprintf(struct events_stats *stats, FILE *fp)
 {
        int i;
        size_t ret = 0;
@@ -910,7 +909,7 @@ size_t events_stats__fprintf(struct events_stats *stats, FILE *fp,
                name = perf_event__name(i);
                if (!strcmp(name, "UNKNOWN"))
                        continue;
-               if (skip_empty && !stats->nr_events[i])
+               if (symbol_conf.skip_empty && !stats->nr_events[i])
                        continue;
 
                if (i && total) {

diff --git a/tools/perf/util/events_stats.h b/tools/perf/util/events_stats.h
index 8fecc9fbaecc49ca929934d07449811e69d9649e..f43e5b1a366a2c038890fca016ba3f7e09a38393 100644 (file)
--- a/tools/perf/util/events_stats.h
+++ b/tools/perf/util/events_stats.h
@@ -52,7 +52,6 @@ struct hists_stats {
 
 void events_stats__inc(struct events_stats *stats, u32 type);
 
-size_t events_stats__fprintf(struct events_stats *stats, FILE *fp,
-                            bool skip_empty);
+size_t events_stats__fprintf(struct events_stats *stats, FILE *fp);
 
 #endif /* __PERF_EVENTS_STATS_ */

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 2e9e193179dd54dbdc7352dfb187ce68cdc53a1f..f028f113c4fd4e96547a2be63d4f5b7a2c05d68b 100644 (file)
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -2706,8 +2706,7 @@ void hist__account_cycles(struct branch_stack *bs, struct addr_location *al,
        }
 }
 
-size_t evlist__fprintf_nr_events(struct evlist *evlist, FILE *fp,
-                                bool skip_empty)
+size_t evlist__fprintf_nr_events(struct evlist *evlist, FILE *fp)
 {
        struct evsel *pos;
        size_t ret = 0;
@@ -2715,7 +2714,8 @@ size_t evlist__fprintf_nr_events(struct evlist *evlist, FILE *fp,
        evlist__for_each_entry(evlist, pos) {
                struct hists *hists = evsel__hists(pos);
 
-               if (skip_empty && !hists->stats.nr_samples && !hists->stats.nr_lost_samples)
+               if (symbol_conf.skip_empty && !hists->stats.nr_samples &&
+                   !hists->stats.nr_lost_samples)
                        continue;
 
                ret += fprintf(fp, "%s stats:\n", evsel__name(pos));

diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index 8fb3bdd2918814aefad06339dd23be9cbd30834a..5273f5c370507b94512dc67662e857ef6b2e1ce4 100644 (file)
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -375,8 +375,7 @@ void hists__inc_nr_lost_samples(struct hists *hists, u32 lost);
 size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,
                      int max_cols, float min_pcnt, FILE *fp,
                      bool ignore_callchains);
-size_t evlist__fprintf_nr_events(struct evlist *evlist, FILE *fp,
-                                bool skip_empty);
+size_t evlist__fprintf_nr_events(struct evlist *evlist, FILE *fp);
 
 void hists__filter_by_dso(struct hists *hists);
 void hists__filter_by_thread(struct hists *hists);

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index a10343b9dcd419b249a571ef67e3b37485cba4ef..0ec92d47373c454255390042c60fbe13e52a90f9 100644 (file)
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -2696,8 +2696,7 @@ size_t perf_session__fprintf_dsos_buildid(struct perf_session *session, FILE *fp
        return machines__fprintf_dsos_buildid(&session->machines, fp, skip, parm);
 }
 
-size_t perf_session__fprintf_nr_events(struct perf_session *session, FILE *fp,
-                                      bool skip_empty)
+size_t perf_session__fprintf_nr_events(struct perf_session *session, FILE *fp)
 {
        size_t ret;
        const char *msg = "";
@@ -2707,7 +2706,7 @@ size_t perf_session__fprintf_nr_events(struct perf_session *session, FILE *fp,
 
        ret = fprintf(fp, "\nAggregated stats:%s\n", msg);
 
-       ret += events_stats__fprintf(&session->evlist->stats, fp, skip_empty);
+       ret += events_stats__fprintf(&session->evlist->stats, fp);
        return ret;
 }
 

diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index 3b0256e977a6c1a2c2bb5b01f940f9faf14eaddc..4c29dc86956f21eb9c752731cb5ce11ac5d5c84e 100644 (file)
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -130,8 +130,7 @@ size_t perf_session__fprintf_dsos(struct perf_session *session, FILE *fp);
 size_t perf_session__fprintf_dsos_buildid(struct perf_session *session, FILE *fp,
                                          bool (fn)(struct dso *dso, int parm), int parm);
 
-size_t perf_session__fprintf_nr_events(struct perf_session *session, FILE *fp,
-                                      bool skip_empty);
+size_t perf_session__fprintf_nr_events(struct perf_session *session, FILE *fp);
 
 void perf_session__dump_kmaps(struct perf_session *session);
 

diff --git a/tools/perf/util/symbol_conf.h b/tools/perf/util/symbol_conf.h
index c114bbceef4013f099b05cd39ef73b7b1813750f..657cfa5af43cd3809c863a021d750cc761dd9bf3 100644 (file)
--- a/tools/perf/util/symbol_conf.h
+++ b/tools/perf/util/symbol_conf.h
@@ -46,7 +46,8 @@ struct symbol_conf {
                        lazy_load_kernel_maps,
                        keep_exited_threads,
                        annotate_data_member,
-                       annotate_data_sample;
+                       annotate_data_sample,
+                       skip_empty;
        const char      *vmlinux_name,
                        *kallsyms_name,
                        *source_prefix,