perf stat: Move stat_config into config.c

stat_config is accessed by config.c via helper functions, but declared
in builtin-stat. Move to util/config.c so that stub functions aren't
needed in python.c which doesn't link against the builtin files.

To avoid name conflicts change builtin-script to use the same
stat_config as builtin-stat. Rename local variables in tests to avoid
shadow declaration warnings.

Signed-off-by: Ian Rogers <irogers@google.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Colin Ian King <colin.i.king@gmail.com>
Cc: Dapeng Mi <dapeng1.mi@linux.intel.com>
Cc: Howard Chu <howardchu95@gmail.com>
Cc: Ilya Leoshkevich <iii@linux.ibm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Veronika Molnarova <vmolnaro@redhat.com>
Cc: Weilin Wang <weilin.wang@intel.com>
Link: https://lore.kernel.org/r/20241119011644.971342-9-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 25c25058121acb340f1da52ceeb884e40f679c34..7d21a52ad94ecffd0568914e9a95994363804fab 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -85,7 +85,6 @@ static bool                   system_wide;
 static bool                    print_flags;
 static const char              *cpu_list;
 static DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS);
-static struct perf_stat_config stat_config;
 static int                     max_blocks;
 static bool                    native_arch;
 static struct dlfilter         *dlfilter;

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index fdf5172646a598ee769fdc4891bd626e7f1bbba6..77e327d4a9a70c450c0284ddfcb9d581f9300a95 100644 (file)
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -112,8 +112,6 @@ static struct target target = {
        .uid    = UINT_MAX,
 };
 
-#define METRIC_ONLY_LEN 20
-
 static volatile sig_atomic_t   child_pid                       = -1;
 static int                     detailed_run                    =  0;
 static bool                    transaction_run;
@@ -151,21 +149,6 @@ static struct perf_stat            perf_stat;
 
 static volatile sig_atomic_t done = 0;
 
-static struct perf_stat_config stat_config = {
-       .aggr_mode              = AGGR_GLOBAL,
-       .aggr_level             = MAX_CACHE_LVL + 1,
-       .scale                  = true,
-       .unit_width             = 4, /* strlen("unit") */
-       .run_count              = 1,
-       .metric_only_len        = METRIC_ONLY_LEN,
-       .walltime_nsecs_stats   = &walltime_nsecs_stats,
-       .ru_stats               = &ru_stats,
-       .big_num                = true,
-       .ctl_fd                 = -1,
-       .ctl_fd_ack             = -1,
-       .iostat_run             = false,
-};
-
 /* Options set from the command line. */
 struct opt_aggr_mode {
        bool node, socket, die, cluster, cache, core, thread, no_aggr;
@@ -1071,16 +1054,6 @@ static void sig_atexit(void)
        kill(getpid(), signr);
 }
 
-void perf_stat__set_big_num(int set)
-{
-       stat_config.big_num = (set != 0);
-}
-
-void perf_stat__set_no_csv_summary(int set)
-{
-       stat_config.no_csv_summary = (set != 0);
-}
-
 static int stat__set_big_num(const struct option *opt __maybe_unused,
                             const char *s __maybe_unused, int unset)
 {

diff --git a/tools/perf/tests/stat.c b/tools/perf/tests/stat.c
index 6468cc0d0204e39753c72f3b1792b2d0ae8f122c..d60983657bade253fd3a233d20431a15acdfd973 100644 (file)
--- a/tools/perf/tests/stat.c
+++ b/tools/perf/tests/stat.c
@@ -27,7 +27,7 @@ static int process_stat_config_event(const struct perf_tool *tool __maybe_unused
                                     struct machine *machine __maybe_unused)
 {
        struct perf_record_stat_config *config = &event->stat_config;
-       struct perf_stat_config stat_config = {};
+       struct perf_stat_config test_stat_config = {};
 
 #define HAS(term, val) \
        has_term(config, PERF_STAT_CONFIG_TERM__##term, val)
@@ -39,25 +39,27 @@ static int process_stat_config_event(const struct perf_tool *tool __maybe_unused
 
 #undef HAS
 
-       perf_event__read_stat_config(&stat_config, config);
+       perf_event__read_stat_config(&test_stat_config, config);
 
-       TEST_ASSERT_VAL("wrong aggr_mode", stat_config.aggr_mode == AGGR_CORE);
-       TEST_ASSERT_VAL("wrong scale",     stat_config.scale == 1);
-       TEST_ASSERT_VAL("wrong interval",  stat_config.interval == 1);
+       TEST_ASSERT_VAL("wrong aggr_mode", test_stat_config.aggr_mode == AGGR_CORE);
+       TEST_ASSERT_VAL("wrong scale",     test_stat_config.scale == 1);
+       TEST_ASSERT_VAL("wrong interval",  test_stat_config.interval == 1);
        return 0;
 }
 
 static int test__synthesize_stat_config(struct test_suite *test __maybe_unused,
                                        int subtest __maybe_unused)
 {
-       struct perf_stat_config stat_config = {
+       struct perf_stat_config test_stat_config = {
                .aggr_mode      = AGGR_CORE,
                .scale          = 1,
                .interval       = 1,
        };
 
        TEST_ASSERT_VAL("failed to synthesize stat_config",
-               !perf_event__synthesize_stat_config(NULL, &stat_config, process_stat_config_event, NULL));
+               !perf_event__synthesize_stat_config(NULL, &test_stat_config,
+                                                   process_stat_config_event,
+                                                   NULL));
 
        return 0;
 }

diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index 68f9407ca74b9202732e8af66972187747ca27ac..2d07c9257a1a3d3dd9f00c00940a2b70f7aa9a99 100644 (file)
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -13,6 +13,7 @@
 #include <sys/param.h>
 #include "cache.h"
 #include "callchain.h"
+#include "header.h"
 #include <subcmd/exec-cmd.h>
 #include "util/event.h"  /* proc_map_timeout */
 #include "util/hist.h"  /* perf_hist_config */
@@ -34,6 +35,22 @@
 
 #define DEBUG_CACHE_DIR ".debug"
 
+#define METRIC_ONLY_LEN 20
+
+struct perf_stat_config stat_config = {
+       .aggr_mode              = AGGR_GLOBAL,
+       .aggr_level             = MAX_CACHE_LVL + 1,
+       .scale                  = true,
+       .unit_width             = 4, /* strlen("unit") */
+       .run_count              = 1,
+       .metric_only_len        = METRIC_ONLY_LEN,
+       .walltime_nsecs_stats   = &walltime_nsecs_stats,
+       .ru_stats               = &ru_stats,
+       .big_num                = true,
+       .ctl_fd                 = -1,
+       .ctl_fd_ack             = -1,
+       .iostat_run             = false,
+};
 
 char buildid_dir[MAXPATHLEN]; /* root dir for buildid, binary cache */
 
@@ -455,6 +472,16 @@ static int perf_ui_config(const char *var, const char *value)
        return 0;
 }
 
+void perf_stat__set_big_num(int set)
+{
+       stat_config.big_num = (set != 0);
+}
+
+static void perf_stat__set_no_csv_summary(int set)
+{
+       stat_config.no_csv_summary = (set != 0);
+}
+
 static int perf_stat_config(const char *var, const char *value)
 {
        if (!strcmp(var, "stat.big-num"))

diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
index 4593c937febb13007d6b5bc0d9a77f7676756989..7fc3ec5684c3eb54bef3979679f87a70fc84e149 100644 (file)
--- a/tools/perf/util/python.c
+++ b/tools/perf/util/python.c
@@ -17,8 +17,6 @@
 #include "trace-event.h"
 #include "mmap.h"
 #include "util/env.h"
-#include "util/kvm-stat.h"
-#include "util/stat.h"
 #include "util/kwork.h"
 #include "util/sample.h"
 #include "util/lock-contention.h"
@@ -1307,14 +1305,6 @@ error:
 /* The following are stubs to avoid dragging in builtin-* objects. */
 /* TODO: move the code out of the builtin-* file into util. */
 
-void perf_stat__set_no_csv_summary(int set __maybe_unused)
-{
-}
-
-void perf_stat__set_big_num(int set __maybe_unused)
-{
-}
-
 int script_spec_register(const char *spec __maybe_unused, struct scripting_ops *ops __maybe_unused)
 {
        return -1;

diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h
index 6f8cff3cd39a46b0dddd8ace0f04d85bfa4ef621..2fda9acd7374c11f097e5857533bff957ff1cbc5 100644 (file)
--- a/tools/perf/util/stat.h
+++ b/tools/perf/util/stat.h
@@ -117,8 +117,9 @@ struct perf_stat_config {
        unsigned int            topdown_level;
 };
 
+extern struct perf_stat_config stat_config;
+
 void perf_stat__set_big_num(int set);
-void perf_stat__set_no_csv_summary(int set);
 
 void update_stats(struct stats *stats, u64 val);
 double avg_stats(struct stats *stats);