perf tool: Add the perf_tool argument to all callbacks
Ian Rogers
reviewerPATCH v2 1/2 perf tool: Add the perf_tool argument to all callbacks
Getting context for what a tool is doing, such as the perf_inject instance, using container_of the tool is a common pattern in the code. This isn't possible event_op2, event_op3 and event_op4 callbacks as the tool isn't passed. Add the argument and then fix function signatures to match. As tools maybe reading a tool from somewhere else, change that code to use the passed in tool.
---
v2: Fix no auxtrace build (Gabriel Marin).
--- tools/perf/builtin-annotate.c | 3 ++- tools/perf/builtin-evlist.c | 3 ++- tools/perf/builtin-inject.c | 36 +++++++++++++++------------ tools/perf/builtin-report.c | 5 ++-- tools/perf/builtin-script.c | 31 +++++++++++++---------- tools/perf/builtin-stat.c | 15 ++++++------ tools/perf/util/auxtrace.c | 9 ++++--- tools/perf/util/auxtrace.h | 18 +++++++++----- tools/perf/util/header.c | 6 +++-- tools/perf/util/header.h | 6 +++-- tools/perf/util/intel-tpebs.c | 3 ++- tools/perf/util/session.c | 35 +++++++++++++------------- tools/perf/util/session.h | 3 ++- tools/perf/util/stat.c | 3 ++- tools/perf/util/stat.h | 3 ++- tools/perf/util/tool.c | 46 ++++++++++++++++++++--------------- tools/perf/util/tool.h | 10 +++++--- 17 files changed, 138 insertions(+), 97 deletions(-)
tools/perf/builtin-annotate.c +2 -1
@@ -313,7 +313,8 @@ static int process_sample_event(const struct perf_tool *tool,return ret; } -static int process_feature_event (struct perf_session *session, +static int process_feature_event (const struct perf_tool *tool__maybe_unused , +struct perf_session *session,union perf_event *event) {if (event->feat.feat_id <HEADER_LAST_FEATURE )
tools/perf/builtin-evlist.c +2 -1
@@ -19,7 +19,8 @@#include "util/tool.h" #include "util/util.h" -static int process_header_feature (struct perf_session *session__maybe_unused , +static int process_header_feature (const struct perf_tool *tool__maybe_unused , +struct perf_session *session__maybe_unused ,union perf_event *event__maybe_unused ) { session_done =1 ;
tools/perf/builtin-inject.c +20 -16
@@ -197,18 +197,20 @@ static int perf_event__drop_oe(const struct perf_tool *tool __maybe_unused, }#endif -static int perf_event__repipe_op2_synth (struct perf_session *session, +static int perf_event__repipe_op2_synth (const struct perf_tool *tool, +struct perf_session *session__maybe_unused ,union perf_event *event) { -return perf_event__repipe_synth (session->tool, event); +return perf_event__repipe_synth (tool, event); } -static int perf_event__repipe_op4_synth (struct perf_session *session, +static int perf_event__repipe_op4_synth (const struct perf_tool *tool, +struct perf_session *session__maybe_unused ,union perf_event *event,u64 data__maybe_unused ,const char *str__maybe_unused ) { -return perf_event__repipe_synth (session->tool, event); +return perf_event__repipe_synth (tool, event); } static int perf_event__repipe_attr(const struct perf_tool *tool,
@@ -258,12 +260,11 @@ static int copy_bytes(struct perf_inject *inject, struct perf_data *data, off_treturn 0 ; } -static s64 perf_event__repipe_auxtrace (struct perf_session *session, +static s64 perf_event__repipe_auxtrace (const struct perf_tool *tool, +struct perf_session *session,union perf_event *event) { -const struct perf_tool *tool = session->tool; - struct perf_inject *inject = container_of(tool, struct perf_inject, - tool); + struct perf_inject *inject = container_of(tool, struct perf_inject, tool);int ret; inject->have_auxtrace = true;
@@ -299,7 +300,8 @@ static s64 perf_event__repipe_auxtrace(struct perf_session *session,#else static s64 -perf_event__repipe_auxtrace (struct perf_session *session__maybe_unused , +perf_event__repipe_auxtrace (const struct perf_tool *tool__maybe_unused , +struct perf_session *session__maybe_unused ,union perf_event *event__maybe_unused ) {pr_err ("AUX area tracing not supported\n" );
@@ -661,12 +663,13 @@ static int perf_event__repipe_exit(const struct perf_tool *tool, }#ifdef HAVE_LIBTRACEEVENT -static int perf_event__repipe_tracing_data (struct perf_session *session, +static int perf_event__repipe_tracing_data (const struct perf_tool *tool, +struct perf_session *session,union perf_event *event) { -perf_event__repipe_synth (session->tool, event); +perf_event__repipe_synth (tool, event); -return perf_event__process_tracing_data (session, event); +return perf_event__process_tracing_data (tool, session, event); }#endif
@@ -1348,7 +1351,7 @@ static int process_build_id(const struct perf_tool *tool, { struct perf_inject *inject = container_of(tool, struct perf_inject, tool); -return perf_event__process_build_id (inject->session, event); +return perf_event__process_build_id (tool, inject->session, event); }static int synthesize_build_id (struct perf_inject *inject,struct dso *dso,pid_t machine_pid)
@@ -1780,9 +1783,10 @@ static int host__repipe(const struct perf_tool *tool,return perf_event__repipe (tool, event, sample, machine); } -static int host__finished_init (struct perf_session *session,union perf_event *event) +static int host__finished_init (const struct perf_tool *tool,struct perf_session *session, +union perf_event *event) { - struct perf_inject *inject = container_of(session->tool, struct perf_inject, tool); + struct perf_inject *inject = container_of(tool, struct perf_inject, tool);struct guest_session *gs = &inject->guest_session;int ret;
@@ -1829,7 +1833,7 @@ static int host__finished_init(struct perf_session *session, union perf_event *eif (ret)return ret; -return perf_event__repipe_op2_synth (session, event); +return perf_event__repipe_op2_synth (tool, session, event); }/*
tools/perf/builtin-report.c +3 -2
@@ -240,10 +240,11 @@ static void setup_forced_leader(struct report *report,evlist__force_leader (evlist); } -static int process_feature_event (struct perf_session *session, +static int process_feature_event (const struct perf_tool *tool, +struct perf_session *session,union perf_event *event) { - struct report *rep = container_of(session->tool, struct report, tool); + struct report *rep = container_of(tool, struct report, tool);if (event->feat.feat_id <HEADER_LAST_FEATURE )return perf_event__process_feature (session, event);
tools/perf/builtin-script.c +18 -13
@@ -2729,7 +2729,8 @@ static int process_switch_event(const struct perf_tool *tool, sample->tid); } -static int process_auxtrace_error (struct perf_session *session, +static int process_auxtrace_error (const struct perf_tool *tool, +struct perf_session *session,union perf_event *event) {if (scripting_ops && scripting_ops->process_auxtrace_error) {
@@ -2737,7 +2738,7 @@ static int process_auxtrace_error(struct perf_session *session,return 0 ; } -return perf_event__process_auxtrace_error (session, event); +return perf_event__process_auxtrace_error (tool, session, event); } static int
@@ -2785,7 +2786,8 @@ process_bpf_events(const struct perf_tool *tool __maybe_unused, }static int -process_bpf_metadata_event (struct perf_session *session__maybe_unused , +process_bpf_metadata_event (const struct perf_tool *tool__maybe_unused , +struct perf_session *session__maybe_unused ,union perf_event *event) {perf_event__fprintf (event,NULL , stdout);
@@ -3544,7 +3546,8 @@ static void script__setup_sample_type(struct perf_script *script) } } -static int process_stat_round_event (struct perf_session *session, +static int process_stat_round_event (const struct perf_tool *tool__maybe_unused , +struct perf_session *session,union perf_event *event) {struct perf_record_stat_round *round = &event->stat_round;
@@ -3559,7 +3562,8 @@ static int process_stat_round_event(struct perf_session *session,return 0 ; } -static int process_stat_config_event (struct perf_session *session__maybe_unused , +static int process_stat_config_event (const struct perf_tool *tool__maybe_unused , +struct perf_session *session__maybe_unused ,union perf_event *event) {perf_event__read_stat_config (&stat_config, &event->stat_config);
@@ -3593,10 +3597,10 @@ static int set_maps(struct perf_script *script) }static -int process_thread_map_event (struct perf_session *session, +int process_thread_map_event (const struct perf_tool *tool, +struct perf_session *session__maybe_unused ,union perf_event *event) { -const struct perf_tool *tool = session->tool; struct perf_script *script = container_of(tool, struct perf_script, tool);if (dump_trace)
@@ -3615,10 +3619,10 @@ int process_thread_map_event(struct perf_session *session, }static -int process_cpu_map_event (struct perf_session *session, +int process_cpu_map_event (const struct perf_tool *tool, +struct perf_session *session__maybe_unused ,union perf_event *event) { -const struct perf_tool *tool = session->tool; struct perf_script *script = container_of(tool, struct perf_script, tool);if (dump_trace)
@@ -3636,7 +3640,8 @@ int process_cpu_map_event(struct perf_session *session,return set_maps (script); } -static int process_feature_event (struct perf_session *session, +static int process_feature_event (const struct perf_tool *tool__maybe_unused , +struct perf_session *session,union perf_event *event) {if (event->feat.feat_id <HEADER_LAST_FEATURE )
@@ -3645,13 +3650,13 @@ static int process_feature_event(struct perf_session *session, }#ifdef HAVE_AUXTRACE_SUPPORT -static int perf_script__process_auxtrace_info (struct perf_session *session, +static int perf_script__process_auxtrace_info (const struct perf_tool *tool, +struct perf_session *session,union perf_event *event) { -int ret =perf_event__process_auxtrace_info (session, event); +int ret =perf_event__process_auxtrace_info (tool, session, event);if (ret ==0 ) { -const struct perf_tool *tool = session->tool; struct perf_script *script = container_of(tool, struct perf_script, tool); ret =perf_script__setup_per_event_dump (script);
tools/perf/builtin-stat.c +8 -7
@@ -2197,7 +2197,8 @@ static int __cmd_record(const struct option stat_options[], struct opt_aggr_modereturn argc; } -static int process_stat_round_event (struct perf_session *session, +static int process_stat_round_event (const struct perf_tool *tool__maybe_unused , +struct perf_session *session,union perf_event *event) {struct perf_record_stat_round *stat_round = &event->stat_round;
@@ -2222,10 +2223,10 @@ static int process_stat_round_event(struct perf_session *session, }static -int process_stat_config_event (struct perf_session *session, +int process_stat_config_event (const struct perf_tool *tool, +struct perf_session *session,union perf_event *event) { -const struct perf_tool *tool = session->tool; struct perf_stat *st = container_of(tool, struct perf_stat, tool);perf_event__read_stat_config (&stat_config, &event->stat_config);
@@ -2271,10 +2272,10 @@ static int set_maps(struct perf_stat *st) }static -int process_thread_map_event (struct perf_session *session, +int process_thread_map_event (const struct perf_tool *tool, +struct perf_session *session__maybe_unused ,union perf_event *event) { -const struct perf_tool *tool = session->tool; struct perf_stat *st = container_of(tool, struct perf_stat, tool);if (st->threads) {
@@ -2290,10 +2291,10 @@ int process_thread_map_event(struct perf_session *session, }static -int process_cpu_map_event (struct perf_session *session, +int process_cpu_map_event (const struct perf_tool *tool, +struct perf_session *session__maybe_unused ,union perf_event *event) { -const struct perf_tool *tool = session->tool; struct perf_stat *st = container_of(tool, struct perf_stat, tool);struct perf_cpu_map *cpus;
tools/perf/util/auxtrace.c +6 -3
@@ -1379,7 +1379,8 @@ static void unleader_auxtrace(struct perf_session *session) } } -int perf_event__process_auxtrace_info (struct perf_session *session, +int perf_event__process_auxtrace_info (const struct perf_tool *tool__maybe_unused , +struct perf_session *session,union perf_event *event) {enum auxtrace_type type = event->auxtrace_info.type;
@@ -1423,7 +1424,8 @@ int perf_event__process_auxtrace_info(struct perf_session *session,return 0 ; } -s64 perf_event__process_auxtrace (struct perf_session *session, +s64 perf_event__process_auxtrace (const struct perf_tool *tool__maybe_unused , +struct perf_session *session,union perf_event *event) {s64 err;
@@ -1820,7 +1822,8 @@ void events_stats__auxtrace_error_warn(const struct events_stats *stats) } } -int perf_event__process_auxtrace_error (struct perf_session *session, +int perf_event__process_auxtrace_error (const struct perf_tool *tool__maybe_unused , +struct perf_session *session,union perf_event *event) {if (auxtrace__dont_decode (session))
tools/perf/util/auxtrace.h +12 -6
@@ -615,11 +615,14 @@ void auxtrace_synth_error(struct perf_record_auxtrace_error *auxtrace_error, int int code, int cpu, pid_t pid, pid_t tid, u64 ip, const char *msg, u64 timestamp); -int perf_event__process_auxtrace_info (struct perf_session *session, +int perf_event__process_auxtrace_info (const struct perf_tool *tool, +struct perf_session *session,union perf_event *event); -s64 perf_event__process_auxtrace (struct perf_session *session, +s64 perf_event__process_auxtrace (const struct perf_tool *tool, +struct perf_session *session,union perf_event *event); -int perf_event__process_auxtrace_error (struct perf_session *session, +int perf_event__process_auxtrace_error (const struct perf_tool *tool, +struct perf_session *session,union perf_event *event);int itrace_do_parse_synth_opts (struct itrace_synth_opts *synth_opts,const char *str,int unset);
@@ -728,21 +731,24 @@ int auxtrace_record__options(struct auxtrace_record *itr __maybe_unused, }static inline -int perf_event__process_auxtrace_info (struct perf_session *session__maybe_unused , +int perf_event__process_auxtrace_info (const struct perf_tool *tool__maybe_unused , +struct perf_session *session__maybe_unused ,union perf_event *event__maybe_unused ) {return 0 ; }static inline -s64 perf_event__process_auxtrace (struct perf_session *session__maybe_unused , +s64 perf_event__process_auxtrace (const struct perf_tool *tool__maybe_unused , +struct perf_session *session__maybe_unused ,union perf_event *event__maybe_unused ) {return 0 ; }static inline -int perf_event__process_auxtrace_error (struct perf_session *session__maybe_unused , +int perf_event__process_auxtrace_error (const struct perf_tool *tool__maybe_unused , +struct perf_session *session__maybe_unused ,union perf_event *event__maybe_unused ) {return 0 ;
tools/perf/util/header.c +4 -2
@@ -4541,7 +4541,8 @@ int perf_event__process_event_update(const struct perf_tool *tool __maybe_unused }#ifdef HAVE_LIBTRACEEVENT -int perf_event__process_tracing_data (struct perf_session *session, +int perf_event__process_tracing_data (const struct perf_tool *tool__maybe_unused , +struct perf_session *session,union perf_event *event) {ssize_t size_read, padding, size = event->tracing_data.size;
@@ -4589,7 +4590,8 @@ int perf_event__process_tracing_data(struct perf_session *session, }#endif -int perf_event__process_build_id (struct perf_session *session, +int perf_event__process_build_id (const struct perf_tool *tool__maybe_unused , +struct perf_session *session,union perf_event *event) { __event_process_build_id(&event->build_id,
tools/perf/util/header.h +4 -2
@@ -178,10 +178,12 @@ int perf_event__process_event_update(const struct perf_tool *tool,size_t perf_event__fprintf_attr (union perf_event *event,FILE *fp);size_t perf_event__fprintf_event_update (union perf_event *event,FILE *fp);#ifdef HAVE_LIBTRACEEVENT -int perf_event__process_tracing_data (struct perf_session *session, +int perf_event__process_tracing_data (const struct perf_tool *tool, +struct perf_session *session,union perf_event *event);#endif -int perf_event__process_build_id (struct perf_session *session, +int perf_event__process_build_id (const struct perf_tool *tool, +struct perf_session *session,union perf_event *event);bool is_perf_magic (u64 magic);
tools/perf/util/intel-tpebs.c +2 -1
@@ -216,7 +216,8 @@ static int process_sample_event(const struct perf_tool *tool __maybe_unused,return 0 ; } -static int process_feature_event (struct perf_session *session, +static int process_feature_event (const struct perf_tool *tool__maybe_unused , +struct perf_session *session,union perf_event *event) {if (event->feat.feat_id <HEADER_LAST_FEATURE )
tools/perf/util/session.c +18 -17
@@ -1437,19 +1437,19 @@ static s64 perf_session__process_user_event(struct perf_session *session,*/ if (!perf_data__is_pipe (session->data))lseek (fd, file_offset,SEEK_SET ); - err = tool->tracing_data (session, event); + err = tool->tracing_data (tool, session, event);break ;case PERF_RECORD_HEADER_BUILD_ID : - err = tool->build_id (session, event); + err = tool->build_id (tool, session, event);break ;case PERF_RECORD_FINISHED_ROUND : err = tool->finished_round (tool, event, oe);break ;case PERF_RECORD_ID_INDEX : - err = tool->id_index (session, event); + err = tool->id_index (tool, session, event);break ;case PERF_RECORD_AUXTRACE_INFO : - err = tool->auxtrace_info (session, event); + err = tool->auxtrace_info (tool, session, event);break ;case PERF_RECORD_AUXTRACE :/*
@@ -1459,45 +1459,45 @@ static s64 perf_session__process_user_event(struct perf_session *session,*/ if (!perf_data__is_pipe (session->data))lseek (fd, file_offset + event->header.size,SEEK_SET ); - err = tool->auxtrace (session, event); + err = tool->auxtrace (tool, session, event);break ;case PERF_RECORD_AUXTRACE_ERROR :perf_session__auxtrace_error_inc (session, event); - err = tool->auxtrace_error (session, event); + err = tool->auxtrace_error (tool, session, event);break ;case PERF_RECORD_THREAD_MAP : - err = tool->thread_map (session, event); + err = tool->thread_map (tool, session, event);break ;case PERF_RECORD_CPU_MAP : - err = tool->cpu_map (session, event); + err = tool->cpu_map (tool, session, event);break ;case PERF_RECORD_STAT_CONFIG : - err = tool->stat_config (session, event); + err = tool->stat_config (tool, session, event);break ;case PERF_RECORD_STAT : - err = tool->stat (session, event); + err = tool->stat (tool, session, event);break ;case PERF_RECORD_STAT_ROUND : - err = tool->stat_round (session, event); + err = tool->stat_round (tool, session, event);break ;case PERF_RECORD_TIME_CONV : session->time_conv = event->time_conv; - err = tool->time_conv (session, event); + err = tool->time_conv (tool, session, event);break ;case PERF_RECORD_HEADER_FEATURE : - err = tool->feature (session, event); + err = tool->feature (tool, session, event);break ;case PERF_RECORD_COMPRESSED :case PERF_RECORD_COMPRESSED2 : - err = tool->compressed (session, event, file_offset, file_path); + err = tool->compressed (tool, session, event, file_offset, file_path);if (err)dump_event (session->evlist, event, file_offset, &sample, file_path);break ;case PERF_RECORD_FINISHED_INIT : - err = tool->finished_init (session, event); + err = tool->finished_init (tool, session, event);break ;case PERF_RECORD_BPF_METADATA : - err = tool->bpf_metadata (session, event); + err = tool->bpf_metadata (tool, session, event);break ;default : err = -EINVAL ;
@@ -2647,7 +2647,8 @@ static int perf_session__set_guest_cpu(struct perf_session *session, pid_t pid,return 0 ; } -int perf_event__process_id_index (struct perf_session *session, +int perf_event__process_id_index (const struct perf_tool *tool__maybe_unused , +struct perf_session *session,union perf_event *event) {struct evlist *evlist = session->evlist;
tools/perf/util/session.h +2 -1
@@ -202,7 +202,8 @@ int perf_session__deliver_synth_attr_event(struct perf_session *session,int perf_session__dsos_hit_all (struct perf_session *session); -int perf_event__process_id_index (struct perf_session *session, +int perf_event__process_id_index (const struct perf_tool *tool, +struct perf_session *session,union perf_event *event); int perf_event__process_finished_round(const struct perf_tool *tool,
tools/perf/util/stat.c +2 -1
@@ -645,7 +645,8 @@ void perf_stat_process_percore(struct perf_stat_config *config, struct evlist *eevsel__process_percore (evsel); } -int perf_event__process_stat_event (struct perf_session *session, +int perf_event__process_stat_event (const struct perf_tool *tool__maybe_unused , +struct perf_session *session,union perf_event *event) {struct perf_counts_values count, *ptr;
tools/perf/util/stat.h +2 -1
@@ -216,7 +216,8 @@ union perf_event;struct perf_session ;struct target ; -int perf_event__process_stat_event (struct perf_session *session, +int perf_event__process_stat_event (const struct perf_tool *tool, +struct perf_session *session,union perf_event *event);size_t perf_event__fprintf_stat (union perf_event *event,FILE *fp);
tools/perf/util/tool.c +27 -19
130 lines not on this page · raw message
tools/perf/util/tool.h +6 -4
@@ -26,10 +26,12 @@ typedef int (*event_attr_op)(const struct perf_tool *tool,union perf_event *event, struct evlist **pevlist); -typedef int (*event_op2 )(struct perf_session *session,union perf_event *event); -typedef s64 (*event_op3 )(struct perf_session *session,union perf_event *event); -typedef int (*event_op4 )(struct perf_session *session,union perf_event *event,u64 data, -const char *str); +typedef int (*event_op2 )(const struct perf_tool *tool,struct perf_session *session, +union perf_event *event); +typedef s64 (*event_op3 )(const struct perf_tool *tool,struct perf_session *session, +union perf_event *event); +typedef int (*event_op4 )(const struct perf_tool *tool,struct perf_session *session, +union perf_event *event,u64 data,const char *str);typedef int (*event_oe )(const struct perf_tool *tool,union perf_event *event,struct ordered_events *oe);
Signature · 1 line
2.51.2.1041.gc1ab5b90ca-goog
Ian Rogers
reviewerPATCH v2 2/2 perf tool: Add a delegate_tool that just delegates actions to another tool
Add an ability to be able to compose perf_tools, by having one perform an action and then calling a delegate. Currently the perf_tools have if-then-elses setting the callback and then if-then-elses within the callback. Understanding the behavior is complex as it is in two places and logic for numerous operations, within things like perf inject, is interwoven. By chaining perf_tools together based on command line options this kind of code can be avoided.
--- tools/perf/util/tool.c | 171 +++++++++++++++++++++++++++++++++++++++++ tools/perf/util/tool.h | 9 +++ 2 files changed, 180 insertions(+)
tools/perf/util/tool.c +171 -0
@@ -321,3 +321,174 @@ bool perf_tool__compressed_is_stub(const struct perf_tool *tool) {return tool->compressed == perf_session__process_compressed_event_stub; } + +#define CREATE_DELEGATE_SAMPLE (name) \ + static int delegate_ ## name(const struct perf_tool *tool, \ + union perf_event *event, \ + struct perf_sample *sample, \ + struct evsel *evsel, \ + struct machine *machine) \ + { \ + struct delegate_tool *del_tool = container_of(tool, struct delegate_tool, tool); \ + struct perf_tool *delegate = del_tool->delegate; \ + return delegate->name(delegate, event, sample, evsel, machine); \ + } +CREATE_DELEGATE_SAMPLE (read); +CREATE_DELEGATE_SAMPLE (sample); + +#define CREATE_DELEGATE_ATTR (name) \ + static int delegate_ ## name(const struct perf_tool *tool, \ + union perf_event *event, \ + struct evlist **pevlist) \ + { \ + struct delegate_tool *del_tool = container_of(tool, struct delegate_tool, tool); \ + struct perf_tool *delegate = del_tool->delegate; \ + return delegate->name(delegate, event, pevlist); \ + } +CREATE_DELEGATE_ATTR (attr); +CREATE_DELEGATE_ATTR (event_update); + +#define CREATE_DELEGATE_OE (name) \ + static int delegate_ ## name(const struct perf_tool *tool, \ + union perf_event *event, \ + struct ordered_events *oe) \ + { \ + struct delegate_tool *del_tool = container_of(tool, struct delegate_tool, tool); \ + struct perf_tool *delegate = del_tool->delegate; \ + return delegate->name(delegate, event, oe); \ + } +CREATE_DELEGATE_OE (finished_round); + +#define CREATE_DELEGATE_OP (name) \ + static int delegate_ ## name(const struct perf_tool *tool, \ + union perf_event *event, \ + struct perf_sample *sample, \ + struct machine *machine) \ + { \ + struct delegate_tool *del_tool = container_of(tool, struct delegate_tool, tool); \ + struct perf_tool *delegate = del_tool->delegate; \ + return delegate->name(delegate, event, sample, machine); \ + } +CREATE_DELEGATE_OP (aux); +CREATE_DELEGATE_OP (aux_output_hw_id); +CREATE_DELEGATE_OP (bpf); +CREATE_DELEGATE_OP (cgroup); +CREATE_DELEGATE_OP (comm); +CREATE_DELEGATE_OP (context_switch); +CREATE_DELEGATE_OP (exit); +CREATE_DELEGATE_OP (fork); +CREATE_DELEGATE_OP (itrace_start); +CREATE_DELEGATE_OP (ksymbol); +CREATE_DELEGATE_OP (lost); +CREATE_DELEGATE_OP (lost_samples); +CREATE_DELEGATE_OP (mmap); +CREATE_DELEGATE_OP (mmap2); +CREATE_DELEGATE_OP (namespaces); +CREATE_DELEGATE_OP (text_poke); +CREATE_DELEGATE_OP (throttle); +CREATE_DELEGATE_OP (unthrottle); + +#define CREATE_DELEGATE_OP2 (name) \ + static int delegate_ ## name(const struct perf_tool *tool, \ + struct perf_session *session, \ + union perf_event *event) \ + { \ + struct delegate_tool *del_tool = container_of(tool, struct delegate_tool, tool); \ + struct perf_tool *delegate = del_tool->delegate; \ + return delegate->name(delegate, session, event); \ + } +CREATE_DELEGATE_OP2 (auxtrace_error); +CREATE_DELEGATE_OP2 (auxtrace_info); +CREATE_DELEGATE_OP2 (bpf_metadata); +CREATE_DELEGATE_OP2 (build_id); +CREATE_DELEGATE_OP2 (cpu_map); +CREATE_DELEGATE_OP2 (feature); +CREATE_DELEGATE_OP2 (finished_init); +CREATE_DELEGATE_OP2 (id_index); +CREATE_DELEGATE_OP2 (stat); +CREATE_DELEGATE_OP2 (stat_config); +CREATE_DELEGATE_OP2 (stat_round); +CREATE_DELEGATE_OP2 (thread_map); +CREATE_DELEGATE_OP2 (time_conv); +CREATE_DELEGATE_OP2 (tracing_data); + +#define CREATE_DELEGATE_OP3 (name) \ + static s64 delegate_ ## name(const struct perf_tool *tool, \ + struct perf_session *session, \ + union perf_event *event) \ + { \ + struct delegate_tool *del_tool = container_of(tool, struct delegate_tool, tool); \ + struct perf_tool *delegate = del_tool->delegate; \ + return delegate->name(delegate, session, event); \ + } +CREATE_DELEGATE_OP3 (auxtrace); + +#define CREATE_DELEGATE_OP4 (name) \ + static int delegate_ ## name(const struct perf_tool *tool, \ + struct perf_session *session, \ + union perf_event *event, \ + u64 data, \ + const char *str) \ + { \ + struct delegate_tool *del_tool = container_of(tool, struct delegate_tool, tool); \ + struct perf_tool *delegate = del_tool->delegate; \ + return delegate->name(delegate, session, event, data, str); \ + } +CREATE_DELEGATE_OP4 (compressed); + +void delegate_tool__init (struct delegate_tool *tool,struct perf_tool *delegate) +{ + tool->delegate = delegate; + + tool->tool.ordered_events = delegate->ordered_events; + tool->tool.ordering_requires_timestamps = delegate->ordering_requires_timestamps; + tool->tool.namespace_events = delegate->namespace_events; + tool->tool.cgroup_events = delegate->cgroup_events; + tool->tool.no_warn = delegate->no_warn; + tool->tool.show_feat_hdr = delegate->show_feat_hdr; + + tool->tool.sample = delegate_sample; + tool->tool.read = delegate_read; + + tool->tool.mmap = delegate_mmap; + tool->tool.mmap2 = delegate_mmap2; + tool->tool.comm = delegate_comm; + tool->tool.namespaces = delegate_namespaces; + tool->tool.cgroup = delegate_cgroup; + tool->tool.fork = delegate_fork; + tool->tool.exit = delegate_exit; + tool->tool.lost = delegate_lost; + tool->tool.lost_samples = delegate_lost_samples; + tool->tool.aux = delegate_aux; + tool->tool.itrace_start = delegate_itrace_start; + tool->tool.aux_output_hw_id = delegate_aux_output_hw_id; + tool->tool.context_switch = delegate_context_switch; + tool->tool.throttle = delegate_throttle; + tool->tool.unthrottle = delegate_unthrottle; + tool->tool.ksymbol = delegate_ksymbol; + tool->tool.bpf = delegate_bpf; + tool->tool.text_poke = delegate_text_poke; + + tool->tool.attr = delegate_attr; + tool->tool.event_update = delegate_event_update; + + tool->tool.tracing_data = delegate_tracing_data; + + tool->tool.finished_round = delegate_finished_round; + + tool->tool.build_id = delegate_build_id; + tool->tool.id_index = delegate_id_index; + tool->tool.auxtrace_info = delegate_auxtrace_info; + tool->tool.auxtrace_error = delegate_auxtrace_error; + tool->tool.time_conv = delegate_time_conv; + tool->tool.thread_map = delegate_thread_map; + tool->tool.cpu_map = delegate_cpu_map; + tool->tool.stat_config = delegate_stat_config; + tool->tool.stat = delegate_stat; + tool->tool.stat_round = delegate_stat_round; + tool->tool.feature = delegate_feature; + tool->tool.finished_init = delegate_finished_init; + tool->tool.bpf_metadata = delegate_bpf_metadata; + tool->tool.compressed = delegate_compressed; + tool->tool.auxtrace = delegate_auxtrace; +}
tools/perf/util/tool.h +9 -0
@@ -102,4 +102,13 @@ int process_event_sample_stub(const struct perf_tool *tool,struct evsel *evsel, struct machine *machine); +struct delegate_tool { +/** @tool: The actual tool that calls the delegate. */ +struct perf_tool tool; +/** @delegate: The tool that is delegated to. */ +struct perf_tool *delegate; +}; + +void delegate_tool__init (struct delegate_tool *tool,struct perf_tool *delegate); +#endif /* __PERF_TOOL_H */
Signature · 1 line
2.51.2.1041.gc1ab5b90ca-goog
Quoted 8 lines · Ian Rogers
Getting context for what a tool is doing, such as the
perf_injectinstance, usingcontainer_ofthe tool is a common pattern in the code. This isn't possibleevent_op2,event_op3andevent_op4callbacks as the tool isn't passed. Add the argument and then fix function signatures to match. As tools maybe reading a tool from somewhere else, change that code to use the passed in tool.[...]
Applied to perf-tools-next, thanks!
Best regards,
Namhyung