On Wed, Oct 30, 2024 at 06:42:44PM -0700, Ian Rogers wrote:
> Move arch_syscalls__strerrno_function out of builtin-trace.c to env.c
> so that there isn't a util to builtin function call. This allows the
> python.c stub to be removed. Also, remove declaration/prototype from
> env.h and make static to reduce scope. The include is moved inside
> ifdefs to avoid, "defined but unused warnings".
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/perf/builtin-trace.c | 1 -
> tools/perf/trace/beauty/arch_errno_names.sh | 3 ++-
> tools/perf/util/env.c | 4 ++++
> tools/perf/util/env.h | 2 --
> tools/perf/util/python.c | 6 ------
> 5 files changed, 6 insertions(+), 10 deletions(-)
>
> diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
> index 748b061f8678..5d0345480140 100644
> --- a/tools/perf/builtin-trace.c
> +++ b/tools/perf/builtin-trace.c
> @@ -1108,7 +1108,6 @@ static bool syscall_arg__strtoul_btf_type(char *bf __maybe_unused, size_t size _
> .strtoul = STUL_STRARRAY_FLAGS, \
> .parm = &strarray__##array, }
>
> -#include "trace/beauty/arch_errno_names.c"
> #include "trace/beauty/eventfd.c"
> #include "trace/beauty/futex_op.c"
> #include "trace/beauty/futex_val3.c"
> diff --git a/tools/perf/trace/beauty/arch_errno_names.sh b/tools/perf/trace/beauty/arch_errno_names.sh
> index 30d3889b2957..b22890b8d272 100755
> --- a/tools/perf/trace/beauty/arch_errno_names.sh
> +++ b/tools/perf/trace/beauty/arch_errno_names.sh
> @@ -57,7 +57,8 @@ create_arch_errno_table_func()
> archlist="$1"
> default="$2"
>
> - printf 'arch_syscalls__strerrno_t *arch_syscalls__strerrno_function(const char *arch)\n'
> + printf 'static arch_syscalls__strerrno_t *\n'
> + printf 'arch_syscalls__strerrno_function(const char *arch)\n'
> printf '{\n'
> for arch in $archlist; do
> arch_str=$(arch_string "$arch")
> diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c
> index ccb464026642..e58f56412fbb 100644
> --- a/tools/perf/util/env.c
> +++ b/tools/perf/util/env.c
> @@ -470,6 +470,10 @@ const char *perf_env__arch(struct perf_env *env)
> return normalize_arch(arch_name);
> }
>
> +#if defined(HAVE_SYSCALL_TABLE_SUPPORT) && defined(HAVE_LIBTRACEEVENT)
> +#include "trace/beauty/arch_errno_names.c"
> +#endif
> +
> const char *perf_env__arch_strerrno(struct perf_env *env __maybe_unused, int err __maybe_unused)
> {
> #if defined(HAVE_SYSCALL_TABLE_SUPPORT) && defined(HAVE_LIBTRACEEVENT)
> diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h
> index ae604c4edbb7..e9db89395dab 100644
> --- a/tools/perf/util/env.h
> +++ b/tools/perf/util/env.h
> @@ -56,8 +56,6 @@ struct pmu_caps {
>
> typedef const char *(arch_syscalls__strerrno_t)(int err);
>
> -arch_syscalls__strerrno_t *arch_syscalls__strerrno_function(const char *arch);
> -
> struct perf_env {
> char *hostname;
> char *os_release;
> diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
> index 77e02fcc51dd..35d84a96dbec 100644
> --- a/tools/perf/util/python.c
> +++ b/tools/perf/util/python.c
> @@ -16,7 +16,6 @@
> #include "thread_map.h"
> #include "trace-event.h"
> #include "mmap.h"
> -#include "util/env.h"
> #include "util/kwork.h"
> #include "util/sample.h"
> #include "util/lock-contention.h"
> @@ -1305,11 +1304,6 @@ PyMODINIT_FUNC PyInit_perf(void)
> /* The following are stubs to avoid dragging in builtin-* objects. */
> /* TODO: move the code out of the builtin-* file into util. */
>
> -arch_syscalls__strerrno_t *arch_syscalls__strerrno_function(const char *arch __maybe_unused)
> -{
> - return NULL;
> -}
> -
> struct kwork_work *perf_kwork_add_work(struct perf_kwork *kwork __maybe_unused,
> struct kwork_class *class __maybe_unused,
> struct kwork_work *key __maybe_unused)
> --
> 2.47.0.163.g1226f6d8fa-goog
>