Cache the arch specific stderrno routine
Arnaldo Carvalho de Melo
maintainercover Cache the arch specific stderrno routine
From: Arnaldo Carvalho de Melo <[email protected]>
Hi,
Please take a look,
- Arnaldo
Arnaldo Carvalho de Melo (2):
perf env: Introduce perf_env__arch_strerrno()
perf env: Cache the arch specific strerrno function in perf_env__arch_strerrno()
tools/perf/builtin-trace.c | 6 ++---- tools/perf/trace/beauty/arch_errno_names.sh | 6 +++--- tools/perf/trace/beauty/beauty.h | 2 -- tools/perf/util/env.c | 9 +++++++++ tools/perf/util/env.h | 6 ++++++ 5 files changed, 20 insertions(+), 9 deletions(-)
Signature · 1 line
2.41.0
Arnaldo Carvalho de Melo
maintainerPATCH 1/2 perf env: Introduce perf_env__arch_strerrno()
From: Arnaldo Carvalho de Melo <[email protected]>
That will cache the arch specific function translating error numbers to strings.
--- tools/perf/builtin-trace.c | 6 ++---- tools/perf/util/env.c | 7 +++++++ tools/perf/util/env.h | 1 + 3 files changed, 10 insertions(+), 4 deletions(-)
tools/perf/builtin-trace.c +2 -4
@@ -2470,9 +2470,8 @@ static int trace__fprintf_callchain(struct trace *trace, struct perf_sample *samstatic const char *errno_to_name (struct evsel *evsel,int err) {struct perf_env *env =evsel__env (evsel); -const char *arch_name =perf_env__arch (env); -return arch_syscalls__strerrno (arch_name, err); +return perf_env__arch_strerrno (env, err); } static int trace__sys_exit(struct trace *trace, struct evsel *evsel,
@@ -4264,12 +4263,11 @@ static size_t thread__dump_stats(struct thread_trace *ttrace, printed +=fprintf (fp," %9.3f %9.2f%%\n" , max, pct);if (trace->errno_summary && stats->nr_failures) { -const char *arch_name =perf_env__arch (trace->host->env);int e;for (e =0 ; e < stats->max_errno; ++e) {if (stats->errnos[e] !=0 ) -fprintf (fp,"\t\t\t\t%s: %d\n" ,arch_syscalls__strerrno (arch_name, e +1 ), stats->errnos[e]); +fprintf (fp,"\t\t\t\t%s: %d\n" ,perf_env__arch_strerrno (trace->host->env, e +1 ), stats->errnos[e]); } } }
tools/perf/util/env.c +7 -0
@@ -12,6 +12,7 @@#include <string.h> #include "pmus.h" #include "strbuf.h" +#include "trace/beauty/beauty.h" struct perf_env perf_env;
@@ -453,6 +454,12 @@ const char *perf_env__arch(struct perf_env *env)return normalize_arch (arch_name); } +const char *perf_env__arch_strerrno (struct perf_env *env,int err) +{ +const char *arch_name =perf_env__arch (env); +return arch_syscalls__strerrno (arch_name, err); +} +const char *perf_env__cpuid (struct perf_env *env) {int status;
tools/perf/util/env.h +1 -0
@@ -164,6 +164,7 @@ int perf_env__read_cpu_topology_map(struct perf_env *env);void cpu_cache_level__free (struct cpu_cache_level *cache);const char *perf_env__arch (struct perf_env *env); +const char *perf_env__arch_strerrno (struct perf_env *env,int err);const char *perf_env__cpuid (struct perf_env *env);const char *perf_env__raw_arch (struct perf_env *env);int perf_env__nr_cpus_avail (struct perf_env *env);
Signature · 1 line
2.41.0
Arnaldo Carvalho de Melo
maintainerPATCH 2/2 perf env: Cache the arch specific strerrno function in perf_env__arch_strerrno()
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
So that we don't have to go thru the series of strcmp(arch) calls for each id -> string translation.
--- tools/perf/trace/beauty/arch_errno_names.sh | 6 +++--- tools/perf/trace/beauty/beauty.h | 2 -- tools/perf/util/env.c | 6 ++++-- tools/perf/util/env.h | 5 +++++ 4 files changed, 12 insertions(+), 7 deletions(-)
tools/perf/trace/beauty/arch_errno_names.sh +3 -3
@@ -57,13 +57,13 @@ create_arch_errno_table_func() archlist="$1" default="$2" - printf 'const char *arch_syscalls__strerrno(const char *arch, int err)\n' + printf 'arch_syscalls__strerrno_t *arch_syscalls__strerrno_function(const char *arch)\n' printf '{\n' for arch in $archlist; do printf '\tif (!strcmp(arch, "%s"))\n' $(arch_string "$arch") - printf '\t\treturn errno_to_name__%s(err);\n' $(arch_string "$arch") + printf '\t\treturn errno_to_name__%s;\n' $(arch_string "$arch") done - printf '\treturn errno_to_name__%s(err);\n' $(arch_string "$default") + printf '\treturn errno_to_name__%s;\n' $(arch_string "$default") printf '}\n' }
tools/perf/trace/beauty/beauty.h +0 -2
@@ -251,6 +251,4 @@ size_t open__scnprintf_flags(unsigned long flags, char *bf, size_t size, bool shvoid syscall_arg__set_ret_scnprintf (struct syscall_arg *arg,size_t (*ret_scnprintf)(char *bf,size_t size,struct syscall_arg *arg)); -const char *arch_syscalls__strerrno (const char *arch,int err); -#endif /* _PERF_TRACE_BEAUTY_H */
tools/perf/util/env.c +4 -2
@@ -456,8 +456,10 @@ const char *perf_env__arch(struct perf_env *env)const char *perf_env__arch_strerrno (struct perf_env *env,int err) { -const char *arch_name =perf_env__arch (env); -return arch_syscalls__strerrno (arch_name, err); +if (env->arch_strerrno ==NULL ) + env->arch_strerrno =arch_syscalls__strerrno_function (perf_env__arch (env)); + +return env->arch_strerrno ? env->arch_strerrno (err) :"no arch specific strerrno function" ; }const char *perf_env__cpuid (struct perf_env *env)
tools/perf/util/env.h +5 -0
@@ -53,6 +53,10 @@ struct pmu_caps {char *pmu_name; }; +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;
@@ -135,6 +139,7 @@ struct perf_env {*/ bool enabled; } clock; +arch_syscalls__strerrno_t *arch_strerrno; };enum perf_compress_type {
Signature · 1 line
2.41.0
Quoted 5 lines · Arnaldo Carvalho de Melo
From: Arnaldo Carvalho de Melo <[email protected]>
Hi,
Quoted 7 lines
Please take a look,
- Arnaldo
Arnaldo Carvalho de Melo (2):
perf env: Introduceperf_env__arch_strerrno()
perf env: Cache the arch specific strerrno function inperf_env__arch_strerrno()
Thanks,
Ian
Quoted 10 lines
tools/perf/builtin-trace.c | 6 ++---- tools/perf/trace/beauty/arch_errno_names.sh | 6 +++--- tools/perf/trace/beauty/beauty.h | 2 -- tools/perf/util/env.c | 9 +++++++++ tools/perf/util/env.h | 6 ++++++ 5 files changed, 20 insertions(+), 9 deletions(-)--
2.41.0
Arnaldo Carvalho de Melo
maintainerEm Mon, Dec 04, 2023 at 11:10:54AM -0800, Ian Rogers escreveu:
Quoted 6 lines · Arnaldo Carvalho de Melo
Quoted 3 lines
Arnaldo Carvalho de Melo (2):
perf env: Introduceperf_env__arch_strerrno()
perf env: Cache the arch specific strerrno function inperf_env__arch_strerrno()Reviewed-by Ian Rogers <[email protected]>
Thanks, stamped the patches with that,
- Arnaldo