Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / tools / perf / util / probe-event.h

diff --git a/tools/perf/util/probe-event.h b/tools/perf/util/probe-event.h
index a393a3f..e9db1a2 100644 (file)
--- a/tools/perf/util/probe-event.h
+++ b/tools/perf/util/probe-event.h
@@ -57,6 +57,7 @@ struct perf_probe_arg_field {
 struct perf_probe_arg {
        char                            *name;  /* Argument name */
        char                            *var;   /* Variable name */
+       char                            *type;  /* Type name */
        struct perf_probe_arg_field     *field; /* Structure fields */
 };
 
@@ -73,25 +74,25 @@ struct perf_probe_event {
 /* Line number container */
 struct line_node {
        struct list_head        list;
-       unsigned int            line;
+       int                     line;
 };
 
 /* Line range */
 struct line_range {
        char                    *file;          /* File name */
        char                    *function;      /* Function name */
-       unsigned int            start;          /* Start line number */
-       unsigned int            end;            /* End line number */
+       int                     start;          /* Start line number */
+       int                     end;            /* End line number */
        int                     offset;         /* Start line offset */
        char                    *path;          /* Real path name */
        struct list_head        line_list;      /* Visible lines */
 };
 
 /* Command string to events */
-extern void parse_perf_probe_command(const char *cmd,
-                                    struct perf_probe_event *pev);
-extern void parse_kprobe_trace_command(const char *cmd,
-                                      struct kprobe_trace_event *tev);
+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);
@@ -103,22 +104,22 @@ extern int synthesize_perf_probe_arg(struct perf_probe_arg *pa, char *buf,
 extern bool perf_probe_event_need_dwarf(struct perf_probe_event *pev);
 
 /* Convert from kprobe_trace_event to perf_probe_event */
-extern void convert_to_perf_probe_event(struct kprobe_trace_event *tev,
-                                       struct perf_probe_event *pev);
+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 void parse_line_range_desc(const char *cmd, struct line_range *lr);
+extern int parse_line_range_desc(const char *cmd, struct line_range *lr);
 
 
-extern void add_perf_probe_events(struct perf_probe_event *pevs, int ntevs,
-                                 bool force_add);
-extern void del_perf_probe_events(struct strlist *dellist);
-extern void show_perf_probe_events(void);
-extern void show_line_range(struct line_range *lr);
+extern int add_perf_probe_events(struct perf_probe_event *pevs, int npevs,
+                                bool force_add, int max_probe_points);
+extern int del_perf_probe_events(struct strlist *dellist);
+extern int show_perf_probe_events(void);
+extern int show_line_range(struct line_range *lr);
 
 
 /* Maximum index number of event-name postfix */