1 files changed, 12 insertions, 17 deletions

diff --git a/tools/perf/util/probe-event.h b/tools/perf/util/probe-event.h
index e9db1a214ca4..5af39243a25b 100644
--- a/tools/perf/util/probe-event.h
+++ b/tools/perf/util/probe-event.h
@@ -7,33 +7,33 @@
 extern bool probe_event_dry_run;
 
 /* kprobe-tracer tracing point */
-struct kprobe_trace_point {
+struct probe_trace_point {
         char            *symbol;        /* Base symbol */
         unsigned long   offset;         /* Offset from symbol */
         bool            retprobe;       /* Return probe flag */
 };
 
-/* kprobe-tracer tracing argument referencing offset */
-struct kprobe_trace_arg_ref {
-        struct kprobe_trace_arg_ref     *next;  /* Next reference */
+/* probe-tracer tracing argument referencing offset */
+struct probe_trace_arg_ref {
+        struct probe_trace_arg_ref      *next;  /* Next reference */
         long                            offset; /* Offset value */
 };
 
 /* kprobe-tracer tracing argument */
-struct kprobe_trace_arg {
+struct probe_trace_arg {
         char                            *name;  /* Argument name */
         char                            *value; /* Base value */
         char                            *type;  /* Type name */
-        struct kprobe_trace_arg_ref     *ref;   /* Referencing offset */
+        struct probe_trace_arg_ref      *ref;   /* Referencing offset */
 };
 
 /* kprobe-tracer tracing event (point + arg) */
-struct kprobe_trace_event {
+struct probe_trace_event {
         char                            *event; /* Event name */
         char                            *group; /* Group name */
-        struct kprobe_trace_point       point;  /* Trace point */
+        struct probe_trace_point        point;  /* Trace point */
         int                             nargs;  /* Number of args */
-        struct kprobe_trace_arg         *args;  /* Arguments */
+        struct probe_trace_arg          *args;  /* Arguments */
 };
 
 /* Perf probe probing point */
@@ -50,6 +50,7 @@ struct perf_probe_point {
 struct perf_probe_arg_field {
         struct perf_probe_arg_field     *next;  /* Next field */
         char                            *name;  /* Name of the field */
+        long                            index;  /* Array index number */
         bool                            ref;    /* Referencing flag */
 };
 
@@ -85,31 +86,25 @@ struct line_range {
         int                     end;            /* End line number */
         int                     offset;         /* Start line offset */
         char                    *path;          /* Real path name */
+        char                    *comp_dir;      /* Compile directory */
         struct list_head        line_list;      /* Visible lines */
 };
 
 /* Command string to events */
 extern int parse_perf_probe_command(const char *cmd,
                                     struct perf_probe_event *pev);
-extern int parse_kprobe_trace_command(const char *cmd,
-                                      struct kprobe_trace_event *tev);
 
 /* Events to command string */
 extern char *synthesize_perf_probe_command(struct perf_probe_event *pev);
-extern char *synthesize_kprobe_trace_command(struct kprobe_trace_event *tev);
+extern char *synthesize_probe_trace_command(struct probe_trace_event *tev);
 extern int synthesize_perf_probe_arg(struct perf_probe_arg *pa, char *buf,
                                      size_t len);
 
 /* Check the perf_probe_event needs debuginfo */
 extern bool perf_probe_event_need_dwarf(struct perf_probe_event *pev);
 
-/* Convert from kprobe_trace_event to perf_probe_event */
-extern int convert_to_perf_probe_event(struct kprobe_trace_event *tev,
-                                       struct perf_probe_event *pev);
-
 /* Release event contents */
 extern void clear_perf_probe_event(struct perf_probe_event *pev);
-extern void clear_kprobe_trace_event(struct kprobe_trace_event *tev);
 
 /* Command string to line-range */
 extern int parse_line_range_desc(const char *cmd, struct line_range *lr);